Commit: f415051a579cabab356b4b92fd046eb07801fb76 Author: Damien Picard Date: Wed Nov 16 12:06:14 2022 +0100 Branches: blender-v3.4-release https://developer.blender.org/rBf415051a579cabab356b4b92fd046eb07801fb76
I18n: fix printf-style format translation in release/scripts/startup Many reports and a few labels used string formatting without explicitly calling tip_() or iface_(), so the untranslated message was used instead of the translated one, even when it was extracted. Differential Revision: https://developer.blender.org/D16405 =================================================================== M release/scripts/startup/bl_operators/anim.py M release/scripts/startup/bl_operators/assets.py M release/scripts/startup/bl_operators/clip.py M release/scripts/startup/bl_operators/file.py M release/scripts/startup/bl_operators/image.py M release/scripts/startup/bl_operators/mesh.py M release/scripts/startup/bl_operators/object.py M release/scripts/startup/bl_operators/object_quick_effects.py M release/scripts/startup/bl_operators/presets.py M release/scripts/startup/bl_operators/screen_play_rendered_anim.py M release/scripts/startup/bl_operators/sequencer.py M release/scripts/startup/bl_operators/userpref.py M release/scripts/startup/bl_operators/wm.py M release/scripts/startup/bl_ui/properties_data_mesh.py M release/scripts/startup/bl_ui/properties_particle.py M release/scripts/startup/bl_ui/properties_workspace.py M release/scripts/startup/bl_ui/space_clip.py M release/scripts/startup/bl_ui/space_topbar.py M release/scripts/startup/bl_ui/space_userpref.py M release/scripts/startup/bl_ui/space_view3d.py =================================================================== diff --git a/release/scripts/startup/bl_operators/anim.py b/release/scripts/startup/bl_operators/anim.py index 539cf838f9c..0f4c6c4b9c3 100644 --- a/release/scripts/startup/bl_operators/anim.py +++ b/release/scripts/startup/bl_operators/anim.py @@ -16,6 +16,7 @@ from bpy.props import ( EnumProperty, StringProperty, ) +from bpy.app.translations import pgettext_tip as tip_ class ANIM_OT_keying_set_export(Operator): @@ -111,7 +112,7 @@ class ANIM_OT_keying_set_export(Operator): break if not found: - self.report({'WARN'}, "Could not find material or light using Shader Node Tree - %s" % (ksp.id)) + self.report({'WARN'}, tip_("Could not find material or light using Shader Node Tree - %s") % (ksp.id)) elif ksp.id.bl_rna.identifier.startswith("CompositorNodeTree"): # Find compositor nodetree using this node tree... for scene in bpy.data.scenes: @@ -119,7 +120,7 @@ class ANIM_OT_keying_set_export(Operator): id_bpy_path = "bpy.data.scenes[\"%s\"].node_tree" % (scene.name) break else: - self.report({'WARN'}, "Could not find scene using Compositor Node Tree - %s" % (ksp.id)) + self.report({'WARN'}, tip_("Could not find scene using Compositor Node Tree - %s") % (ksp.id)) elif ksp.id.bl_rna.name == "Key": # "keys" conflicts with a Python keyword, hence the simple solution won't work id_bpy_path = "bpy.data.shape_keys[\"%s\"]" % (ksp.id.name) @@ -324,7 +325,7 @@ class ClearUselessActions(Operator): action.user_clear() removed += 1 - self.report({'INFO'}, "Removed %d empty and/or fake-user only Actions" + self.report({'INFO'}, tip_("Removed %d empty and/or fake-user only Actions") % removed) return {'FINISHED'} @@ -409,7 +410,7 @@ class UpdateAnimatedTransformConstraint(Operator): print(log) text = bpy.data.texts.new("UpdateAnimatedTransformConstraint Report") text.from_string(log) - self.report({'INFO'}, "Complete report available on '%s' text datablock" % text.name) + self.report({'INFO'}, tip_("Complete report available on '%s' text datablock") % text.name) return {'FINISHED'} diff --git a/release/scripts/startup/bl_operators/assets.py b/release/scripts/startup/bl_operators/assets.py index d8182e25641..1911a98f930 100644 --- a/release/scripts/startup/bl_operators/assets.py +++ b/release/scripts/startup/bl_operators/assets.py @@ -3,8 +3,10 @@ from __future__ import annotations import bpy from bpy.types import Operator - -from bpy.app.translations import pgettext_data as data_ +from bpy.app.translations import ( + pgettext_data as data_, + pgettext_tip as tip_, +) from bpy_extras.asset_utils import ( @@ -125,7 +127,7 @@ class ASSET_OT_open_containing_blend_file(Operator): return {'RUNNING_MODAL'} if returncode: - self.report({'WARNING'}, "Blender sub-process exited with error code %d" % returncode) + self.report({'WARNING'}, tip_("Blender sub-process exited with error code %d") % returncode) if bpy.ops.asset.library_refresh.poll(): bpy.ops.asset.library_refresh() diff --git a/release/scripts/startup/bl_operators/clip.py b/release/scripts/startup/bl_operators/clip.py index 71617a76243..73c0b4cfd8f 100644 --- a/release/scripts/startup/bl_operators/clip.py +++ b/release/scripts/startup/bl_operators/clip.py @@ -6,6 +6,7 @@ from mathutils import ( Vector, Matrix, ) +from bpy.app.translations import pgettext_tip as tip_ def CLIP_spaces_walk(context, all_screens, tarea, tspace, callback, *args): @@ -193,7 +194,7 @@ class CLIP_OT_filter_tracks(Operator): def execute(self, context): num_tracks = self._filter_values(context, self.track_threshold) - self.report({'INFO'}, "Identified %d problematic tracks" % num_tracks) + self.report({'INFO'}, tip_("Identified %d problematic tracks") % num_tracks) return {'FINISHED'} diff --git a/release/scripts/startup/bl_operators/file.py b/release/scripts/startup/bl_operators/file.py index 490fab113c6..32cc50cc3f3 100644 --- a/release/scripts/startup/bl_operators/file.py +++ b/release/scripts/startup/bl_operators/file.py @@ -10,6 +10,7 @@ from bpy.props import ( CollectionProperty, StringProperty, ) +from bpy.app.translations import pgettext_tip as tip_ # ########## Datablock previews... ########## @@ -123,7 +124,7 @@ class WM_OT_previews_batch_generate(Operator): if not self.use_backups: cmd.append("--no_backups") if subprocess.call(cmd): - self.report({'ERROR'}, "Previews generation process failed for file '%s'!" % blen_path) + self.report({'ERROR'}, tip_("Previews generation process failed for file '%s'!") % blen_path) context.window_manager.progress_end() return {'CANCELLED'} context.window_manager.progress_update(i + 1) @@ -234,7 +235,7 @@ class WM_OT_previews_batch_clear(Operator): if not self.use_backups: cmd.append("--no_backups") if subprocess.call(cmd): - self.report({'ERROR'}, "Previews clear process failed for file '%s'!" % blen_path) + self.report({'ERROR'}, tip_("Previews clear process failed for file '%s'!") % blen_path) context.window_manager.progress_end() return {'CANCELLED'} context.window_manager.progress_update(i + 1) diff --git a/release/scripts/startup/bl_operators/image.py b/release/scripts/startup/bl_operators/image.py index 97308b6894f..05bbeebb97f 100644 --- a/release/scripts/startup/bl_operators/image.py +++ b/release/scripts/startup/bl_operators/image.py @@ -3,6 +3,7 @@ import bpy from bpy.types import Operator from bpy.props import StringProperty +from bpy.app.translations import pgettext_tip as tip_ class EditExternally(Operator): @@ -52,8 +53,8 @@ class EditExternally(Operator): if not os.path.exists(filepath) or not os.path.isfile(filepath): self.report({'ERROR'}, - "Image path %r not found, image may be packed or " - "unsaved" % filepath) + tip_("Image path %r not found, image may be packed or " + "unsaved") % filepath) return {'CANCELLED'} cmd = self._editor_guess(context) + [filepath] @@ -183,7 +184,7 @@ class ProjectApply(Operator): except KeyError: import traceback traceback.print_exc() - self.report({'ERROR'}, "Could not find image '%s'" % image_name) + self.report({'ERROR'}, tip_("Could not find image '%s'") % image_name) return {'CANCELLED'} image.reload() diff --git a/release/scripts/startup/bl_operators/mesh.py b/release/scripts/startup/bl_operators/mesh.py index f68df9845ef..1869d54dd9d 100644 --- a/release/scripts/startup/bl_operators/mesh.py +++ b/release/scripts/startup/bl_operators/mesh.py @@ -7,6 +7,7 @@ from bpy.props import ( EnumProperty, IntProperty, ) +from bpy.app.translations import pgettext_tip as tip_ class MeshMirrorUV(Operator): @@ -164,18 +165,18 @@ class MeshMirrorUV(Operator): if total_duplicates and total_no_active_UV: self.report({'WARNING'}, - "%d mesh(es) with no active UV layer, " - "%d duplicates found in %d mesh(es), mirror may be incomplete" + tip_("%d mesh(es) with no active UV layer, " + "%d duplicates found in %d mesh(es), mirror may be incomplete") % (total_no_active_UV, total_duplicates, meshes_with_duplicates)) elif total_no_active_UV: self.report({'WARNING'}, - "%d mesh(es) with no active UV layer" + tip_("%d mesh(es) with no active UV layer") % (total_no_active_UV,)) elif total_duplicates: self.report({'WARNING'}, - "%d duplicates found in %d mesh(es), mirror may be incomplete" + tip_("%d duplicates found in %d mesh(es), mirror may be incomplete") % (total_duplicates, meshes_with_duplicates)) return {'FINISHED'} diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py index 6e08d557353..e3685b6ad78 100644 --- a/release/scripts/startup/bl_operators/object.py +++ b/release/scripts/startup/bl_operators/object.py @@ -8,6 +8,7 @@ from bpy.props import ( IntProperty, StringProperty, ) +from bpy.app.translations import pgettext_tip as tip_ class SelectPattern(Operator): @@ -363,14 +364,12 @@ class ShapeTransfer(Operator): for ob_other in objects: if ob_other.type != 'MESH': self.report({'WARNING'}, - ("Skipping '%s', " - "not a mesh") % ob_other.name) + tip_("Skipping '%s', not a mesh") % ob_other.name) continue me_other = ob_other.data if len(me_other.vertices) != len(me.vertices): self.report({'WARNING'}, - ("Skipping '%s', " - "vertex count differs") % ob_other.name) + tip_("Skipping '%s', vertex count differs") % ob_other.name) continue target_normals = me_nos(me_other.vertices) @@ -508,7 +507,7 @@ class JoinUVs(Operator): if not mesh.uv_layers: self.report({'WARNING'}, - "Object: %s, Mesh: '%s' has no UVs" + tip_("Object: %s, Mesh: '%s' has @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
