[Bf-blender-cvs] [83c21e01dd9] blender-v3.4-release: I18n: improve keymap translations

Damien Picard noreply at git.blender.org
Tue Nov 15 11:09:06 CET 2022


Commit: 83c21e01dd9a8a14ce157285e3060d15d89904c7
Author: Damien Picard
Date:   Tue Nov 15 11:02:22 2022 +0100
Branches: blender-v3.4-release
https://developer.blender.org/rB83c21e01dd9a8a14ce157285e3060d15d89904c7

I18n: improve keymap translations

- The label for modal keymaps was extracted but did not use the proper
  context on translation.
- Same goes for modal keymap items.
- Extract the UI messages from rna_keymap_ui.py
- Translate global keymap names.
- Use the proper context in the status bar for the tool prompt operator

Ref T102071

Maniphest Tasks: T102071

Differential Revision: https://developer.blender.org/D16348

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

M	release/scripts/modules/bl_i18n_utils/settings.py
M	release/scripts/modules/rna_keymap_ui.py
M	release/scripts/startup/bl_operators/wm.py
M	source/blender/makesrna/intern/rna_wm.c

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

diff --git a/release/scripts/modules/bl_i18n_utils/settings.py b/release/scripts/modules/bl_i18n_utils/settings.py
index d8f8d58f609..efb16cf18c0 100644
--- a/release/scripts/modules/bl_i18n_utils/settings.py
+++ b/release/scripts/modules/bl_i18n_utils/settings.py
@@ -548,6 +548,7 @@ CUSTOM_PY_UI_FILES = [
     os.path.join("scripts", "startup", "bl_ui"),
     os.path.join("scripts", "startup", "bl_operators"),
     os.path.join("scripts", "modules", "rna_prop_ui.py"),
+    os.path.join("scripts", "modules", "rna_keymap_ui.py"),
     os.path.join("scripts", "presets", "keyconfig"),
 ]
 
diff --git a/release/scripts/modules/rna_keymap_ui.py b/release/scripts/modules/rna_keymap_ui.py
index 73e9b6cd70f..8daacc2e12e 100644
--- a/release/scripts/modules/rna_keymap_ui.py
+++ b/release/scripts/modules/rna_keymap_ui.py
@@ -75,7 +75,7 @@ def draw_km(display_keymaps, kc, km, children, layout, level):
             subcol = _indented_layout(col, level + 1)
             subrow = subcol.row(align=True)
             subrow.prop(km, "show_expanded_items", text="", emboss=False)
-            subrow.label(text=iface_("%s (Global)") % km.name, translate=False)
+            subrow.label(text=iface_("%s (Global)") % iface_(km.name, i18n_contexts.id_windowmanager), translate=False)
         else:
             km.show_expanded_items = True
 
@@ -335,7 +335,8 @@ def draw_filtered(display_keymaps, filter_type, filter_text, layout):
             col = layout.column()
 
             row = col.row()
-            row.label(text=km.name, icon='DOT')
+            row.label(text=km.name, icon='DOT',
+                      text_ctxt=i18n_contexts.id_windowmanager)
 
             row.label()
             row.label()
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index 3b81f75b08a..1487236038c 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -17,8 +17,11 @@ from bpy.props import (
     IntVectorProperty,
     FloatVectorProperty,
 )
-from bpy.app.translations import pgettext_iface as iface_
-from bpy.app.translations import pgettext_tip as tip_
+from bpy.app.translations import (
+    pgettext_iface as iface_,
+    pgettext_tip as tip_,
+    contexts as i18n_contexts,
+)
 
 
 def _rna_path_prop_search_for_context_impl(context, edit_text, unique_attrs):
@@ -2402,7 +2405,9 @@ class WM_OT_toolbar_prompt(Operator):
             flow = layout.grid_flow(columns=len(status_items), align=True, row_major=True)
             for _, name, item in status_items:
                 row = flow.row(align=True)
-                row.template_event_from_keymap_item(item, text=name)
+                row.template_event_from_keymap_item(
+                    item, text=name, text_ctxt=i18n_contexts.operator_default
+                )
 
         self._keymap = keymap
 
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index eebe595820e..83e3e4eb335 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -2807,6 +2807,7 @@ static void rna_def_keyconfig(BlenderRNA *brna)
   RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_KeyMapItem_propvalue_itemf");
   RNA_def_property_ui_text(
       prop, "Property Value", "The value this event translates to in a modal keymap");
+  RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_WINDOWMANAGER);
   RNA_def_property_update(prop, 0, "rna_KeyMapItem_update");
 
   prop = RNA_def_property(srna, "active", PROP_BOOLEAN, PROP_NONE);



More information about the Bf-blender-cvs mailing list