[Git][java-team/omegat][master] 2 commits: Add an upstream patch from 3.6.0.11

[Andrej Shadura]

Andrej Shadura pushed to branch master at Debian Java Maintainers / omegat


Commits:
e1dd3de6 by Andrej Shadura at 2020-10-04T13:26:53+02:00
Add an upstream patch from 3.6.0.11

- - - - -
34b5ead2 by Andrej Shadura at 2020-10-04T13:28:07+02:00
Update the changelog

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/09-tmxreader2.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+omegat (3.6.0.10+dfsg-3) unstable; urgency=medium
+
+  * Add an upstream patch from 3.6.0.11:
+    - Correctly accept 3-letter lang code.
+      Translations were not loaded when first 2 letters of 3-character
+      language codes were the same.
+      https://sourceforge.net/p/omegat/bugs/845/
+
+ -- Andrej Shadura <andrewsh at debian.org>  Sun, 04 Oct 2020 13:27:14 +0200
+
 omegat (3.6.0.10+dfsg-2) unstable; urgency=medium
 
   * Remove Tiago from Uploaders per his request.


=====================================
debian/patches/09-tmxreader2.patch
=====================================
@@ -0,0 +1,40 @@
+From: Thomas Cordonnier <Thomas.Cordonnier at ext.ec.europa.eu>
+Date: Tue, 20 Nov 2018 14:20:37 +0100
+Subject: Correctly accept 3-letter lang code
+
+Translations not loaded when first 2 letters of 3-character language codes are the same
+
+https://sourceforge.net/p/omegat/bugs/845/
+
+diff --git a/src/org/omegat/util/TMXReader2.java b/src/org/omegat/util/TMXReader2.java
+index 061aa9d..8d35d70 100644
+--- a/src/org/omegat/util/TMXReader2.java
++++ b/src/org/omegat/util/TMXReader2.java
+@@ -7,6 +7,7 @@
+                2012 Thomas Cordonnier
+                2013 Alex Buloichik
+                2014 Aaron Madlon-Kay
++               2018 Thomas Cordonnier
+                Home page: http://www.omegat.org/
+                Support center: http://groups.yahoo.com/group/OmegaT/
+ 
+@@ -527,15 +528,15 @@ public class TMXReader2 {
+         ParsedTuv tuvLW = null; // Tuv with the same language+whatever country
+         for (int i = 0; i < currentTu.tuvs.size(); i++) {
+             ParsedTuv tuv = currentTu.tuvs.get(i);
+-            String tuvLang = tuv.lang;
+-            if (!langLanguage.regionMatches(true, 0, tuvLang, 0, 2)) {
++            String[] tuvLangParts = tuv.lang.split("\\W");
++            if (!langLanguage.equalsIgnoreCase(tuvLangParts[0])) {
+                 // language not equals - there is no sense to processing
+                 continue;
+             }
+-            if (tuvLang.length() < 3) {
++            if (tuvLangParts.length == 1) {
+                 // language only, without country
+                 tuvL = tuv;
+-            } else if (langCountry.regionMatches(true, 0, tuvLang, 3, 2)) {
++            } else if (langCountry.equalsIgnoreCase(tuvLangParts[1])) {
+                 // the same country
+                 tuvLC = tuv;
+             } else {


=====================================
debian/patches/series
=====================================
@@ -6,3 +6,4 @@
 06-use-external-hunspell.patch
 07-do-not-load-jmyspell.patch
 08-disable-extra-dependencies.patch
+09-tmxreader2.patch



View it on GitLab: https://salsa.debian.org/java-team/omegat/-/compare/d3a83ba8aca48ca87387658a5b08a39a9742348c...34b5ead296a2165f436ef8aa90c8bcf44c84a79b

-- 
View it on GitLab: https://salsa.debian.org/java-team/omegat/-/compare/d3a83ba8aca48ca87387658a5b08a39a9742348c...34b5ead296a2165f436ef8aa90c8bcf44c84a79b
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20201004/423833c2/attachment.html>