From c5bbc5db6faac151c32e25d16f52b0060def24fc Mon Sep 17 00:00:00 2001 From: Damien Picard Date: Mon, 13 Feb 2023 22:38:59 +0100 Subject: [PATCH] I18n: disambiguate a few messages - "Value" in the sense of color lightness is not the same word in Japanese as other usages. See #105113. - "Double" as a data type vs. a value. Also extract "Custom Color Presets" in the tracking UI. Run clang-format as well. Pull Request #105187 --- scripts/startup/bl_ui/space_clip.py | 2 +- source/blender/blentranslation/BLT_translation.h | 6 ++++-- .../editors/interface/interface_region_color_picker.cc | 8 ++++---- source/blender/makesrna/intern/rna_volume.c | 3 +++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/scripts/startup/bl_ui/space_clip.py b/scripts/startup/bl_ui/space_clip.py index 076cd322360..b137358d1de 100644 --- a/scripts/startup/bl_ui/space_clip.py +++ b/scripts/startup/bl_ui/space_clip.py @@ -752,7 +752,7 @@ class CLIP_PT_track(CLIP_PT_tracking_panel, Panel): row = layout.row(align=True) row.prop(act_track, "use_custom_color", text="") - CLIP_PT_track_color_presets.draw_menu(row, 'Custom Color Presets') + CLIP_PT_track_color_presets.draw_menu(row, iface_('Custom Color Presets')) row.operator("clip.track_copy_color", icon='COPY_ID', text="") if act_track.use_custom_color: diff --git a/source/blender/blentranslation/BLT_translation.h b/source/blender/blentranslation/BLT_translation.h index f788da8d429..372519cb69f 100644 --- a/source/blender/blentranslation/BLT_translation.h +++ b/source/blender/blentranslation/BLT_translation.h @@ -126,9 +126,10 @@ const char *BLT_translate_do_new_dataname(const char *msgctxt, const char *msgid #define BLT_I18NCONTEXT_EDITOR_VIEW3D "View3D" #define BLT_I18NCONTEXT_EDITOR_FILEBROWSER "File browser" - /* Generic contexts. */ +/* Generic contexts. */ #define BLT_I18NCONTEXT_VIRTUAL_REALITY "Virtual reality" #define BLT_I18NCONTEXT_CONSTRAINT "Constraint" +#define BLT_I18NCONTEXT_COLOR "Color" /* Helper for bpy.app.i18n object... */ typedef struct { @@ -194,8 +195,9 @@ typedef struct { BLT_I18NCONTEXTS_ITEM(BLT_I18NCONTEXT_ID_WINDOWMANAGER, "id_windowmanager"), \ BLT_I18NCONTEXTS_ITEM(BLT_I18NCONTEXT_EDITOR_VIEW3D, "editor_view3d"), \ BLT_I18NCONTEXTS_ITEM(BLT_I18NCONTEXT_EDITOR_FILEBROWSER, "editor_filebrowser"), \ - BLT_I18NCONTEXTS_ITEM(BLT_I18NCONTEXT_VIRTUAL_REALITY, "virtual_reality"), \ + BLT_I18NCONTEXTS_ITEM(BLT_I18NCONTEXT_VIRTUAL_REALITY, "virtual_reality"), \ BLT_I18NCONTEXTS_ITEM(BLT_I18NCONTEXT_CONSTRAINT, "constraint"), \ + BLT_I18NCONTEXTS_ITEM(BLT_I18NCONTEXT_COLOR, "color"), \ { \ NULL, NULL, NULL \ } \ diff --git a/source/blender/editors/interface/interface_region_color_picker.cc b/source/blender/editors/interface/interface_region_color_picker.cc index 169116bba2a..29b32841c31 100644 --- a/source/blender/editors/interface/interface_region_color_picker.cc +++ b/source/blender/editors/interface/interface_region_color_picker.cc @@ -415,7 +415,7 @@ static void ui_colorpicker_circle(uiBlock *block, 0.0, 0, 0, - TIP_("Value")); + CTX_TIP_(BLT_I18NCONTEXT_COLOR, "Value")); hsv_but->gradient_type = UI_GRAD_V_ALT; UI_but_func_set(hsv_but, ui_colorpicker_rgba_update_cb, hsv_but, nullptr); } @@ -469,7 +469,7 @@ static void ui_colorpicker_square(uiBlock *block, 0.0, 0, 0, - TIP_("Value")); + CTX_TIP_(BLT_I18NCONTEXT_COLOR, "Value")); hsv_but->gradient_type = (eButGradientType)(type + 3); UI_but_func_set(hsv_but, ui_colorpicker_rgba_update_cb, hsv_but, nullptr); hsv_but->custom_data = cpicker; @@ -726,7 +726,7 @@ static void ui_block_colorpicker(uiBlock *block, bt = uiDefButF(block, UI_BTYPE_NUM_SLIDER, 0, - IFACE_("Value:"), + CTX_IFACE_(BLT_I18NCONTEXT_COLOR, "Value:"), 0, yco -= UI_UNIT_Y, butwidth, @@ -736,7 +736,7 @@ static void ui_block_colorpicker(uiBlock *block, softmax, 10, 3, - TIP_("Value")); + CTX_TIP_(BLT_I18NCONTEXT_COLOR, "Value")); } UI_but_flag_disable(bt, UI_BUT_UNDO); diff --git a/source/blender/makesrna/intern/rna_volume.c b/source/blender/makesrna/intern/rna_volume.c index 6d4ea18fc38..b842954a3be 100644 --- a/source/blender/makesrna/intern/rna_volume.c +++ b/source/blender/makesrna/intern/rna_volume.c @@ -19,6 +19,8 @@ #include "BLI_math_base.h" +#include "BLT_translation.h" + const EnumPropertyItem rna_enum_volume_grid_data_type_items[] = { {VOLUME_GRID_BOOLEAN, "BOOLEAN", 0, "Boolean", "Boolean"}, {VOLUME_GRID_FLOAT, "FLOAT", 0, "Float", "Single precision float"}, @@ -264,6 +266,7 @@ static void rna_def_volume_grid(BlenderRNA *brna) RNA_def_property_enum_funcs(prop, "rna_VolumeGrid_data_type_get", NULL, NULL); RNA_def_property_enum_items(prop, rna_enum_volume_grid_data_type_items); RNA_def_property_ui_text(prop, "Data Type", "Data type of voxel values"); + RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_VOLUME); prop = RNA_def_property(srna, "channels", PROP_INT, PROP_UNSIGNED); RNA_def_property_clear_flag(prop, PROP_EDITABLE);