[josm] 01/02: Fix loading of translation files by using the absolute filesystem path.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sat Dec 12 17:48:26 UTC 2015


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository josm.

commit c4c264148700b7a40e2480eab33a308d88a43a8f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Dec 12 16:03:22 2015 +0100

    Fix loading of translation files by using the absolute filesystem path.
---
 debian/changelog                             | 7 +++++++
 debian/patches/06-move_data_out_of_jar.patch | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 49cd484..1907479 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+josm (0.0.svn9060+dfsg-2) UNRELEASED; urgency=medium
+
+  * Fix loading of translation files by using the absolute filesystem path.
+    (closes: #807751)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 12 Dec 2015 16:02:23 +0100
+
 josm (0.0.svn9060+dfsg-1) unstable; urgency=medium
 
   * Move from experimental to unstable.
diff --git a/debian/patches/06-move_data_out_of_jar.patch b/debian/patches/06-move_data_out_of_jar.patch
index 144caa1..d7af6f4 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -20,8 +20,8 @@ Forwarded: not-needed
      private static URL getTranslationFile(String lang) {
 -        return Main.class.getResource("/data/"+lang.replace('@', '-')+".lang");
 +        try {
-+            return Main.class.getResource("/data/"+lang.replace('@', '-')+".lang");
-+        } catch (RuntimeException ex) {
++            return new URL("file:///usr/share/josm/data/"+lang.replace('@', '-')+".lang");
++        } catch (MalformedURLException ex) {
 +            return null;
 +        }
      }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git



More information about the Pkg-grass-devel mailing list