[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55568] trunk/blender: I18n: use id_windowmanager context for keymap idnames.

[Bastien Montagne]

Revision: 55568
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55568
Author:   mont29
Date:     2013-03-25 11:35:42 +0000 (Mon, 25 Mar 2013)
Log Message:
-----------
I18n: use id_windowmanager context for keymap idnames. Solves some issues with those names (notably "Clip" one, and "Screen" too) in some translations. Also move "Key" as "Keyboard" (opposed to "Keyframe") to same context.

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
    trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
    trunk/blender/source/blender/editors/space_logic/logic_window.c
    trunk/blender/source/blender/makesrna/intern/rna_sensor.c

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-03-25 11:11:49 UTC (rev 55567)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py	2013-03-25 11:35:42 UTC (rev 55568)
@@ -365,9 +365,10 @@
         walk_properties(cls)
 
     def walk_keymap_hierarchy(hier, msgsrc_prev):
+        km_i18n_context = bpy.app.translations.contexts.id_windowmanager
         for lvl in hier:
             msgsrc = msgsrc_prev + "." + lvl[1]
-            process_msg(msgs, default_context, lvl[0], msgsrc, reports, None, settings)
+            process_msg(msgs, km_i18n_context, lvl[0], msgsrc, reports, None, settings)
             if lvl[3]:
                 walk_keymap_hierarchy(lvl[3], msgsrc)
 
@@ -396,7 +397,6 @@
 
     # And parse keymaps!
     from bpy_extras.keyconfig_utils import KM_HIERARCHY
-
     walk_keymap_hierarchy(KM_HIERARCHY, "KM_HIERARCHY")
 
 

Modified: trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py	2013-03-25 11:11:49 UTC (rev 55567)
+++ trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py	2013-03-25 11:35:42 UTC (rev 55568)
@@ -21,7 +21,9 @@
 from bpy.types import Menu
 from bpy.app.translations import pgettext_iface as iface_
 
+km_i18n_context = bpy.app.translations.contexts.id_windowmanager
 
+
 class USERPREF_MT_keyconfigs(Menu):
     bl_label = "KeyPresets"
     preset_subdir = "keyconfig"
@@ -79,7 +81,7 @@
 
         row = col.row()
         row.prop(km, "show_expanded_children", text="", emboss=False)
-        row.label(text=km.name)
+        row.label(text=km.name, text_ctxt=km_i18n_context)
 
         row.label()
         row.label()
@@ -110,7 +112,7 @@
                 # "Add New" at end of keymap item list
                 col = self.indented_layout(col, level + 1)
                 subcol = col.split(percentage=0.2).column()
-                subcol.operator("wm.keyitem_add", text="Add New", icon='ZOOMIN')
+                subcol.operator("wm.keyitem_add", text="Add New", text_ctxt=km_i18n_context, icon='ZOOMIN')
 
             col.separator()
 

Modified: trunk/blender/source/blender/editors/space_logic/logic_window.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/logic_window.c	2013-03-25 11:11:49 UTC (rev 55567)
+++ trunk/blender/source/blender/editors/space_logic/logic_window.c	2013-03-25 11:35:42 UTC (rev 55568)
@@ -1116,7 +1116,7 @@
 	uiLayout *row, *col;
 
 	row = uiLayoutRow(layout, FALSE);
-	uiItemL(row, IFACE_("Key:"), ICON_NONE);
+	uiItemL(row, CTX_IFACE_(BLF_I18NCONTEXT_ID_WINDOWMANAGER, "Key:"), ICON_NONE);
 	col = uiLayoutColumn(row, FALSE);
 	uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_all_keys") == FALSE);
 	uiItemR(col, ptr, "key", UI_ITEM_R_EVENT, "", ICON_NONE);

Modified: trunk/blender/source/blender/makesrna/intern/rna_sensor.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sensor.c	2013-03-25 11:11:49 UTC (rev 55567)
+++ trunk/blender/source/blender/makesrna/intern/rna_sensor.c	2013-03-25 11:35:42 UTC (rev 55568)
@@ -460,6 +460,7 @@
 	RNA_def_property_enum_items(prop, event_type_items);
 	RNA_def_property_enum_funcs(prop, NULL, "rna_Sensor_keyboard_key_set", NULL);
 	RNA_def_property_ui_text(prop, "Key",  "");
+	RNA_def_property_translation_context(prop, BLF_I18NCONTEXT_ID_WINDOWMANAGER);
 	RNA_def_property_update(prop, NC_LOGIC, NULL);
 	
 	prop = RNA_def_property(srna, "modifier_key_1", PROP_ENUM, PROP_NONE);