[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61084] trunk/blender/release/scripts/ modules/bl_i18n_utils: Update i18n tools for new build_hash...

Bastien Montagne montagne29 at wanadoo.fr
Mon Nov 4 19:26:57 CET 2013


Revision: 61084
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61084
Author:   mont29
Date:     2013-11-04 18:26:56 +0000 (Mon, 04 Nov 2013)
Log Message:
-----------
Update i18n tools for new build_hash...

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
    trunk/blender/release/scripts/modules/bl_i18n_utils/settings.py
    trunk/blender/release/scripts/modules/bl_i18n_utils/utils.py

Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py	2013-11-04 17:02:01 UTC (rev 61083)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py	2013-11-04 18:26:56 UTC (rev 61084)
@@ -791,10 +791,10 @@
 ##### Main functions! #####
 def dump_messages(do_messages, do_checks, settings):
     bl_ver = "Blender " + bpy.app.version_string
-    bl_rev = bpy.app.build_revision
+    bl_hash = bpy.app.build_hash or b'0000000000000000000000000000000000000000'
     bl_date = datetime.datetime.strptime(bpy.app.build_date.decode() + "T" + bpy.app.build_time.decode(),
                                          "%Y-%m-%dT%H:%M:%S")
-    pot = utils.I18nMessages.gen_empty_messages(settings.PARSER_TEMPLATE_ID, bl_ver, bl_rev, bl_date, bl_date.year,
+    pot = utils.I18nMessages.gen_empty_messages(settings.PARSER_TEMPLATE_ID, bl_ver, bl_hash, bl_date, bl_date.year,
                                                 settings=settings)
     msgs = pot.msgs
 

Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/settings.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/settings.py	2013-11-04 17:02:01 UTC (rev 61083)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/settings.py	2013-11-04 18:26:56 UTC (rev 61084)
@@ -146,7 +146,7 @@
 PO_HEADER_KEY = (DEFAULT_CONTEXT, "")
 
 PO_HEADER_MSGSTR = (
-    "Project-Id-Version: {blender_ver} (r{blender_rev})\\n\n"
+    "Project-Id-Version: {blender_ver} ({blender_hash})\\n\n"
     "Report-Msgid-Bugs-To: \\n\n"
     "POT-Creation-Date: {time}\\n\n"
     "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n\n"

Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/utils.py	2013-11-04 17:02:01 UTC (rev 61083)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/utils.py	2013-11-04 18:26:56 UTC (rev 61084)
@@ -408,10 +408,10 @@
         return getattr(collections, 'OrderedDict', dict)()
 
     @classmethod
-    def gen_empty_messages(cls, uid, blender_ver, blender_rev, time, year, default_copyright=True, settings=settings):
+    def gen_empty_messages(cls, uid, blender_ver, blender_hash, time, year, default_copyright=True, settings=settings):
         """Generate an empty I18nMessages object (only header is present!)."""
         fmt = settings.PO_HEADER_MSGSTR
-        msgstr = fmt.format(blender_ver=str(blender_ver), blender_rev=int(blender_rev), time=str(time), uid=str(uid))
+        msgstr = fmt.format(blender_ver=str(blender_ver), blender_hash=blender_hash, time=str(time), uid=str(uid))
         comment = ""
         if default_copyright:
             comment = settings.PO_HEADER_COMMENT_COPYRIGHT.format(year=str(year))




More information about the Bf-blender-cvs mailing list