diff options
author | Bastien Montagne <bastien@blender.org> | 2022-05-09 13:45:16 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2022-05-09 13:45:16 +0300 |
commit | b508999d8d9715155ed0f5a5c8b1a23d1e21c46d (patch) | |
tree | 2d534315153d1bc32d50d53ea216818befe2d56e /release | |
parent | 4ac6177b8d676d9e678126af71067cad3674ff3b (diff) | |
parent | b1b699412979ff7a3f2a48f95f9c3c1d131ba46a (diff) |
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/modules/bl_i18n_utils/bl_extract_messages.py | 3 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 28 |
2 files changed, 15 insertions, 16 deletions
diff --git a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py index 87d54213d1b..604a577eec9 100644 --- a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py +++ b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py @@ -341,7 +341,8 @@ def dump_rna_messages(msgs, reports, settings, verbose=False): msgsrc = "bpy.types." + bl_rna.identifier msgctxt = bl_rna.translation_context or default_context - if bl_rna.name and (bl_rna.name != bl_rna.identifier or msgctxt != default_context): + if bl_rna.name and (bl_rna.name != bl_rna.identifier or + (msgctxt != default_context and not hasattr(bl_rna, 'bl_label'))): process_msg(msgs, msgctxt, bl_rna.name, msgsrc, reports, check_ctxt_rna, settings) if bl_rna.description: diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 60a28fb1ebf..122c7078c04 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -1237,24 +1237,23 @@ class VIEW3D_MT_view_viewpoint(Menu): def draw(self, _context): layout = self.layout - i18n_text_ctxt = bpy.app.translations.contexts_C_to_py['BLT_I18NCONTEXT_EDITOR_VIEW3D'] - layout.operator("view3d.view_camera", text="Camera", text_ctxt=i18n_text_ctxt) + layout.operator("view3d.view_camera", text="Camera", text_ctxt=i18n_contexts.editor_view3d) layout.separator() - layout.operator("view3d.view_axis", text="Top", text_ctxt=i18n_text_ctxt).type = 'TOP' - layout.operator("view3d.view_axis", text="Bottom", text_ctxt=i18n_text_ctxt).type = 'BOTTOM' + layout.operator("view3d.view_axis", text="Top", text_ctxt=i18n_contexts.editor_view3d).type = 'TOP' + layout.operator("view3d.view_axis", text="Bottom", text_ctxt=i18n_contexts.editor_view3d).type = 'BOTTOM' layout.separator() - layout.operator("view3d.view_axis", text="Front", text_ctxt=i18n_text_ctxt).type = 'FRONT' - layout.operator("view3d.view_axis", text="Back", text_ctxt=i18n_text_ctxt).type = 'BACK' + layout.operator("view3d.view_axis", text="Front", text_ctxt=i18n_contexts.editor_view3d).type = 'FRONT' + layout.operator("view3d.view_axis", text="Back", text_ctxt=i18n_contexts.editor_view3d).type = 'BACK' layout.separator() - layout.operator("view3d.view_axis", text="Right", text_ctxt=i18n_text_ctxt).type = 'RIGHT' - layout.operator("view3d.view_axis", text="Left", text_ctxt=i18n_text_ctxt).type = 'LEFT' + layout.operator("view3d.view_axis", text="Right", text_ctxt=i18n_contexts.editor_view3d).type = 'RIGHT' + layout.operator("view3d.view_axis", text="Left", text_ctxt=i18n_contexts.editor_view3d).type = 'LEFT' class VIEW3D_MT_view_navigation(Menu): @@ -1321,33 +1320,32 @@ class VIEW3D_MT_view_align_selected(Menu): def draw(self, _context): layout = self.layout - i18n_text_ctxt = bpy.app.translations.contexts_C_to_py['BLT_I18NCONTEXT_EDITOR_VIEW3D'] - props = layout.operator("view3d.view_axis", text="Top", text_ctxt=i18n_text_ctxt) + props = layout.operator("view3d.view_axis", text="Top", text_ctxt=i18n_contexts.editor_view3d) props.align_active = True props.type = 'TOP' - props = layout.operator("view3d.view_axis", text="Bottom", text_ctxt=i18n_text_ctxt) + props = layout.operator("view3d.view_axis", text="Bottom", text_ctxt=i18n_contexts.editor_view3d) props.align_active = True props.type = 'BOTTOM' layout.separator() - props = layout.operator("view3d.view_axis", text="Front", text_ctxt=i18n_text_ctxt) + props = layout.operator("view3d.view_axis", text="Front", text_ctxt=i18n_contexts.editor_view3d) props.align_active = True props.type = 'FRONT' - props = layout.operator("view3d.view_axis", text="Back", text_ctxt=i18n_text_ctxt) + props = layout.operator("view3d.view_axis", text="Back", text_ctxt=i18n_contexts.editor_view3d) props.align_active = True props.type = 'BACK' layout.separator() - props = layout.operator("view3d.view_axis", text="Right", text_ctxt=i18n_text_ctxt) + props = layout.operator("view3d.view_axis", text="Right", text_ctxt=i18n_contexts.editor_view3d) props.align_active = True props.type = 'RIGHT' - props = layout.operator("view3d.view_axis", text="Left", text_ctxt=i18n_text_ctxt) + props = layout.operator("view3d.view_axis", text="Left", text_ctxt=i18n_contexts.editor_view3d) props.align_active = True props.type = 'LEFT' |