[Bf-blender-cvs] [ff224a6] blender-v2.75-release: Fix T45154: Translation binary file(blender.mo) for Japanese is too small

Sergey Sharybin noreply at git.blender.org
Mon Jun 29 16:18:31 CEST 2015


Commit: ff224a61a54f8aae56bc468689e2b51904e3eb79
Author: Sergey Sharybin
Date:   Mon Jun 29 12:26:15 2015 +0200
Branches: blender-v2.75-release
https://developer.blender.org/rBff224a61a54f8aae56bc468689e2b51904e3eb79

Fix T45154: Translation binary file(blender.mo) for Japanese is too small

The issue was caused by some changes made to msgfmt which were needed to make
modified (cleaned-up, stripped-comments messages) working.

Unfortunately that fix was merged into the release branch, so this fix is to
be ported there as well and verified against rc1 translations.

===================================================================

M	intern/locale/msgfmt.cc

===================================================================

diff --git a/intern/locale/msgfmt.cc b/intern/locale/msgfmt.cc
index b47bae3..4779450 100644
--- a/intern/locale/msgfmt.cc
+++ b/intern/locale/msgfmt.cc
@@ -228,7 +228,7 @@ void make(const char *input_file_name,
     }
     // Record a fuzzy mark.
     if (starts_with(l, "#,") && l.find("fuzzy") != std::string::npos) {
-      fuzzy = 1;
+      fuzzy = true;
     }
     // Skip comments
     if (l[0] == '#') {
@@ -317,8 +317,10 @@ void make(const char *input_file_name,
     l = trim(l);
     if (l.empty()) {
       if (section == SECTION_STR) {
+        add(msgctxt, msgid, msgstr, fuzzy);
         msgctxt = msgid = msgstr = "";
         section = SECTION_NONE;
+        fuzzy = false;
       }
       continue;
     }




More information about the Bf-blender-cvs mailing list