[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48735] trunk/blender/release/scripts/ modules/bl_i18n_utils: Some cleanup, and update to make those files usable both as self-executables and module stuff ...
Bastien Montagne
montagne29 at wanadoo.fr
Sun Jul 8 19:10:10 CEST 2012
Revision: 48735
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48735
Author: mont29
Date: 2012-07-08 17:10:10 +0000 (Sun, 08 Jul 2012)
Log Message:
-----------
Some cleanup, and update to make those files usable both as self-executables and module stuff...
Also updated update_mo to allwo specifying a custom po/mo file.
Modified Paths:
--------------
trunk/blender/release/scripts/modules/bl_i18n_utils/check_po.py
trunk/blender/release/scripts/modules/bl_i18n_utils/clean_po.py
trunk/blender/release/scripts/modules/bl_i18n_utils/import_po_from_branches.py
trunk/blender/release/scripts/modules/bl_i18n_utils/merge_po.py
trunk/blender/release/scripts/modules/bl_i18n_utils/rtl_preprocess.py
trunk/blender/release/scripts/modules/bl_i18n_utils/update_branches.py
trunk/blender/release/scripts/modules/bl_i18n_utils/update_mo.py
trunk/blender/release/scripts/modules/bl_i18n_utils/update_msg.py
trunk/blender/release/scripts/modules/bl_i18n_utils/update_po.py
trunk/blender/release/scripts/modules/bl_i18n_utils/update_pot.py
trunk/blender/release/scripts/modules/bl_i18n_utils/update_trunk.py
Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/check_po.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/check_po.py 2012-07-08 17:08:27 UTC (rev 48734)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/check_po.py 2012-07-08 17:10:10 UTC (rev 48735)
@@ -26,8 +26,11 @@
import sys
from codecs import open
-import settings
-import utils
+try:
+ import settings
+ import utils
+except:
+ from . import (settings, utils)
TRUNK_PO_DIR = settings.TRUNK_PO_DIR
BRANCHES_DIR = settings.BRANCHES_DIR
Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/clean_po.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/clean_po.py 2012-07-08 17:08:27 UTC (rev 48734)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/clean_po.py 2012-07-08 17:10:10 UTC (rev 48735)
@@ -25,11 +25,14 @@
import os
import sys
import collections
-from codecs import open
-import settings
-import utils
+try:
+ import settings
+ import utils
+except:
+ from . import (settings, utils)
+
TRUNK_PO_DIR = settings.TRUNK_PO_DIR
BRANCHES_DIR = settings.BRANCHES_DIR
Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/import_po_from_branches.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/import_po_from_branches.py 2012-07-08 17:08:27 UTC (rev 48734)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/import_po_from_branches.py 2012-07-08 17:10:10 UTC (rev 48735)
@@ -28,9 +28,12 @@
import subprocess
from codecs import open
-import settings
-import utils
-import rtl_preprocess
+try:
+ import settings
+ import utils
+ import rtl_preprocess
+except:
+ from . import (settings, utils, rtl_preprocess)
TRUNK_PO_DIR = settings.TRUNK_PO_DIR
Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/merge_po.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/merge_po.py 2012-07-08 17:08:27 UTC (rev 48734)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/merge_po.py 2012-07-08 17:10:10 UTC (rev 48735)
@@ -29,9 +29,11 @@
# never merged from sources.
import sys
-from codecs import open
-import utils
+try:
+ import utils
+except:
+ from . import utils
def main():
Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/rtl_preprocess.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/rtl_preprocess.py 2012-07-08 17:08:27 UTC (rev 48734)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/rtl_preprocess.py 2012-07-08 17:10:10 UTC (rev 48735)
@@ -35,9 +35,13 @@
import sys
import ctypes
-import settings
-import utils
+try:
+ import settings
+ import utils
+except:
+ from . import (settings, utils)
+
FRIBIDI_LIB = settings.FRIBIDI_LIB
###### Import C library and recreate "defines". #####
Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/update_branches.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/update_branches.py 2012-07-08 17:08:27 UTC (rev 48734)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/update_branches.py 2012-07-08 17:10:10 UTC (rev 48735)
@@ -30,8 +30,12 @@
import sys
import tempfile
-import settings
+try:
+ import settings
+except:
+ from . import settings
+
PY3 = settings.PYTHON3_EXEC
def main():
Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/update_mo.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/update_mo.py 2012-07-08 17:08:27 UTC (rev 48734)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/update_mo.py 2012-07-08 17:10:10 UTC (rev 48735)
@@ -26,8 +26,11 @@
import os
import sys
-import settings
-import utils
+try:
+ import settings
+ import utils
+except:
+ from . import (settings, utils)
GETTEXT_MSGFMT_EXECUTABLE = settings.GETTEXT_MSGFMT_EXECUTABLE
@@ -39,17 +42,19 @@
DOMAIN = settings.DOMAIN
-def process_po(po, lang):
- mo_dir = os.path.join(TRUNK_MO_DIR, lang, "LC_MESSAGES")
+def process_po(po, lang, mo=None):
+ if not mo:
+ mo_dir = os.path.join(TRUNK_MO_DIR, lang, "LC_MESSAGES")
+ # Create dirs if not existing!
+ if not os.path.isdir(mo_dir):
+ os.makedirs(mo_dir, exist_ok = True)
- # Create dirs if not existing!
- os.makedirs(mo_dir, exist_ok = True)
# show stats
cmd = (GETTEXT_MSGFMT_EXECUTABLE,
"--statistics",
po,
"-o",
- os.path.join(mo_dir, ".".join((DOMAIN, "mo"))),
+ mo or os.path.join(mo_dir, ".".join((DOMAIN, "mo"))),
)
print("Running ", " ".join(cmd))
@@ -64,11 +69,18 @@
"under {}.".format(TRUNK_MO_DIR))
parser.add_argument('langs', metavar='ISO_code', nargs='*',
help="Restrict processed languages to those.")
+ parser.add_argument('po', help="Only process that po file (implies --mo).")
+ parser.add_argument('mo', help="Mo file to generate (implies --po).")
args = parser.parse_args()
ret = 0
- if args.langs:
+ if args.po and args.mo:
+ if os.path.exists(args.po):
+ t = process_po(args.po, None, args.mo)
+ if t:
+ ret = t
+ elif args.langs:
for lang in args.langs:
po = os.path.join(TRUNK_PO_DIR, ".".join((lang, "po")))
if os.path.exists(po):
Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/update_msg.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/update_msg.py 2012-07-08 17:08:27 UTC (rev 48734)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/update_msg.py 2012-07-08 17:10:10 UTC (rev 48735)
@@ -26,7 +26,10 @@
import sys
import subprocess
-import settings
+try:
+ import settings
+except:
+ from . import settings
BLENDER_ARGS = [
Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/update_po.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/update_po.py 2012-07-08 17:08:27 UTC (rev 48734)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/update_po.py 2012-07-08 17:10:10 UTC (rev 48735)
@@ -28,9 +28,13 @@
from codecs import open
import shutil
-import settings
-import utils
+try:
+ import settings
+ import utils
+except:
+ from . import (settings, utils)
+
GETTEXT_MSGMERGE_EXECUTABLE = settings.GETTEXT_MSGMERGE_EXECUTABLE
BRANCHES_DIR = settings.BRANCHES_DIR
TRUNK_PO_DIR = settings.TRUNK_PO_DIR
Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/update_pot.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/update_pot.py 2012-07-08 17:08:27 UTC (rev 48734)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/update_pot.py 2012-07-08 17:10:10 UTC (rev 48735)
@@ -31,8 +31,11 @@
import time
import pickle
-import settings
-import utils
+try:
+ import settings
+ import utils
+except:
+ from . import (settings, utils)
COMMENT_PREFIX = settings.COMMENT_PREFIX
Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/update_trunk.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/update_trunk.py 2012-07-08 17:08:27 UTC (rev 48734)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/update_trunk.py 2012-07-08 17:10:10 UTC (rev 48735)
@@ -33,7 +33,10 @@
import sys
import shutil
-import settings
+try:
+ import settings
+except:
+ from . import settings
TRUNK_PO_DIR = settings.TRUNK_PO_DIR
TRUNK_MO_DIR = settings.TRUNK_MO_DIR
More information about the Bf-blender-cvs
mailing list