blender
/
blender
75
260
Fork 349
Code Issues 5.9k Pull Requests 543 Projects 19 Wiki Activity

I18n: disambiguate messages #105420

Merged
Bastien Montagne merged 2 commits from pioverfour/blender:dp_disambiguate into blender-v3.5-release 2023-03-07 12:32:12 +01:00
Conversation 2 Commits 2 Files Changed 13
Damien Picard commented 2023-03-03 23:06:55 +01:00
Collaborator
  • "Lines" in the sense of number of lines
  • "Number" can mean "amount, count" or "index, offset"
  • "Second" can be an ordinal number or a unit
  • "Root": add the brush curve to the "square root falloff" sense
  • "Strip" can be a sequence or a type of hair rendering
  • "Constant" in the sense of a value, for the Geometry Nodes add
    submenu (#105447).

Additionally, extract:

  • "Press a key" from the Keymap preferences.
  • "MaskLayer", upon new mask layer creation

Ref #43295, #105447

- "Lines" in the sense of number of lines - "Number" can mean "amount, count" or "index, offset" - "Second" can be an ordinal number or a unit - "Root": add the brush curve to the "square root falloff" sense - "Strip" can be a sequence or a type of hair rendering - "Constant" in the sense of a value, for the Geometry Nodes add submenu (#105447). Additionally, extract: - "Press a key" from the Keymap preferences. - "MaskLayer", upon new mask layer creation Ref #43295, #105447
Damien Picard requested review from Bastien Montagne 2023-03-03 23:07:12 +01:00
Damien Picard added the
Interest
Translations
 label 2023-03-03 23:07:26 +01:00
Damien Picard force-pushed dp_disambiguate from 50e5b1c5a7 to a669759957 2023-03-04 02:29:35 +01:00 Compare
Damien Picard force-pushed dp_disambiguate from a669759957 to 5f8bec1308 2023-03-06 21:47:55 +01:00 Compare
Damien Picard force-pushed dp_disambiguate from 5f8bec1308 to 5ddae3be6c 2023-03-07 00:57:30 +01:00 Compare
Damien Picard force-pushed dp_disambiguate from 5ddae3be6c to d77f97b0da 2023-03-07 02:10:54 +01:00 Compare
Bastien Montagne requested changes 2023-03-07 10:49:42 +01:00
source/blender/blentranslation/BLT_translation.h
@ -132,1 +132,4 @@
#define BLT_I18NCONTEXT_COLOR "Color"
#define BLT_I18NCONTEXT_AMOUNT "Amount"
#define BLT_I18NCONTEXT_UNIT "Unit"
#define BLT_I18NCONTEXT_HAIR "Hair"
Bastien Montagne commented 2023-03-07 10:49:28 +01:00
Owner

I don't think that one is needed, for the time being at least, we can use the new 'Curves' ID context.

Which leads to another topic:

  • BLT_I18NCONTEXT_ID_CURVE should be renamed to BLT_I18NCONTEXT_ID_CURVE_DEPRECATED (only the C define, not the underlying string), this ID type will be removed soon(ish).
  • BLT_I18NCONTEXT_ID_HAIR should be renamed to BLT_I18NCONTEXT_ID_CURVES (since the to-be-done Hair ID type was renamed to Curves). That one does include renaming the py 'constant' as well, and updating the string value.

(Hair and the new curves are the same type of data now).

These changes are for main though, not 3.5.

I don't think that one is needed, for the time being at least, we can use the new 'Curves' ID context. Which leads to another topic: * `BLT_I18NCONTEXT_ID_CURVE` should be renamed to `BLT_I18NCONTEXT_ID_CURVE_DEPRECATED` (only the C define, not the underlying string), this ID type will be removed soon(ish). * `BLT_I18NCONTEXT_ID_HAIR` should be renamed to `BLT_I18NCONTEXT_ID_CURVES` (since the to-be-done `Hair` ID type was renamed to `Curves`). That one does include renaming the py 'constant' as well, and updating the string value. (Hair and the new curves are the same type of data now). These changes are for main though, not 3.5.
Damien Picard commented 2023-03-07 11:24:01 +01:00
Poster
Collaborator

BLT_I18NCONTEXT_ID_CURVE was already renamed to BLT_I18NCONTEXT_ID_CURVE_LEGACY, and I just removed replaced this new BLT_I18NCONTEXT_ID_HAIR by BLT_I18NCONTEXT_ID_CURVES.

`BLT_I18NCONTEXT_ID_CURVE` was already renamed to `BLT_I18NCONTEXT_ID_CURVE_LEGACY`, and I just removed replaced this new `BLT_I18NCONTEXT_ID_HAIR` by `BLT_I18NCONTEXT_ID_CURVES`.
Bastien Montagne commented 2023-03-07 11:34:21 +01:00
Owner

Arg right, think I was still on 2.93 branch when I checked the code!

Arg right, think I was still on 2.93 branch when I checked the code!
mont29 marked this conversation as resolved
Damien Picard force-pushed dp_disambiguate from d77f97b0da to 357c21f896 2023-03-07 11:22:10 +01:00 Compare
Bastien Montagne requested changes 2023-03-07 11:34:32 +01:00
source/blender/makesrna/intern/rna_brush.c
@ -2557,2 +2557,4 @@
RNA_def_property_enum_items(prop, brush_curve_preset_items);
RNA_def_property_ui_text(prop, "Curve Preset", "");
RNA_def_property_translation_context(prop,
BLT_I18NCONTEXT_ID_CURVE_LEGACY); /* Abusing id_curve :/ */
Bastien Montagne commented 2023-03-07 11:33:53 +01:00
Owner

Better use the new one here, legacy will be removed at some point, so would avoid using it in new code.

Better use the new one here, legacy will be removed at some point, so would avoid using it in new code.
Damien Picard commented 2023-03-07 11:46:08 +01:00
Poster
Collaborator

All right!

Come to think of it, when the legacy ID is removed we can always rename the context to something like the generic BLT_I18NCONTEXT_CURVE, so the messages don’t get fuzzy without reason.

All right! Come to think of it, when the legacy ID is removed we can always rename the context to something like the generic `BLT_I18NCONTEXT_CURVE`, so the messages don’t get fuzzy without reason.
Bastien Montagne commented 2023-03-07 12:30:55 +01:00
Owner

Yes... or just do a massive Search&Replace in the POs ;)

Yes... or just do a massive Search&Replace in the POs ;)
😆 1
Damien Picard force-pushed dp_disambiguate from 357c21f896 to 82430dedef 2023-03-07 11:44:22 +01:00 Compare
Damien Picard commented 2023-03-07 11:47:09 +01:00
Poster
Collaborator

@mont29 Be careful, I sneaked a new commit in there since earlier, a follow up to #105417.

@mont29 Be careful, I sneaked a new commit in there since earlier, a follow up to #105417.
Damien Picard force-pushed dp_disambiguate from 82430dedef to a0c6f008cf 2023-03-07 11:49:35 +01:00 Compare
Bastien Montagne approved these changes 2023-03-07 12:30:58 +01:00
Bastien Montagne commented 2023-03-07 12:31:48 +01:00
Owner

@mont29 Be careful, I sneaked a new commit in there since earlier, a follow up to #105417.

How dare you! 👹

> @mont29 Be careful, I sneaked a new commit in there since earlier, a follow up to #105417. How dare you! 👹
😆 1
Bastien Montagne merged commit a668e3b73a into blender-v3.5-release 2023-03-07 12:32:12 +01:00
Bastien Montagne deleted branch dp_disambiguate 2023-03-07 12:32:13 +01:00

Reviewers

Bastien Montagne approved these changes 2023-03-07 12:30:58 +01:00
Sign in to join this conversation.
Reviewers
Request review
No reviewers
Bastien Montagne
Labels
Apply labels
Clear labels   
Interest
Alembic
   
Interest
Animation & Rigging
   
Interest
Asset Browser
   
Interest
Asset Browser Project Overview
   
Interest
Audio
   
Interest
Automated Testing
   
Interest
Blender Asset Bundle
   
Interest
BlendFile
   
Interest
Collada
   
Interest
Compatibility
This issue affects/is about backward or forward compatibility   
Interest
Compositing
   
Interest
Core
   
Interest
Cycles
   
Interest
Dependency Graph
   
Interest
Development Management
   
Interest
EEVEE & Viewport
   
Interest
Freestyle
   
Interest
Geometry Nodes
   
Interest
Grease Pencil
   
Interest
ID Management
   
Interest
Images & Movies
   
Interest
Import Export
   
Interest
Line Art
   
Interest
Masking
   
Interest
Metal
   
Interest
Modeling
   
Interest
Modifiers
   
Interest
Motion Tracking
   
Interest
Nodes & Physics
   
Interest
OpenGL
   
Interest
Overrides
   
Interest
Performance
   
Interest
Physics
   
Interest
Pipeline, Assets & IO
   
Interest
Platforms, Builds & Tests
   
Interest
Python API
   
Interest
Render & Cycles
   
Interest
Render Pipeline
   
Interest
Sculpt, Paint & Texture
   
Interest
Text Editor
   
Interest
Translations
   
Interest
Triaging
   
Interest
Undo
   
Interest
USD
   
Interest
User Interface
   
Interest
UV Editing
   
Interest
VFX & Video
   
Interest
Video Sequencer
   
Interest
Virtual Reality
   
Interest
Vulkan
  
Interest: Wayland
  
Legacy
Blender 2.8 Project
   
Legacy
Milestone 1: Basic, Local Asset Browser
   
Legacy
OpenGL Error
  
Meta
Good First Issue
   
Meta
Papercut
   
Meta
Retrospective
   
Meta
Security
Issues relating to security: https://wiki.blender.org/wiki/Process/Vulnerability_Reports
  
Module
Animation & Rigging
   
Module
Core
   
Module
Development Management
   
Module
EEVEE & Viewport
   
Module
Grease Pencil
   
Module
Modeling
   
Module
Nodes & Physics
   
Module
Pipeline, Assets & IO
   
Module
Platforms, Builds & Tests
   
Module
Python API
   
Module
Render & Cycles
   
Module
Sculpt, Paint & Texture
   
Module
Triaging
   
Module
User Interface
   
Module
VFX & Video
  
Platform
FreeBSD
   
Platform
Linux
   
Platform
macOS
   
Platform
Windows
  
Priority
High
   
Priority
Low
   
Priority
Normal
   
Priority
Unbreak Now!
  
Status
Archived
   
Status
Confirmed
   
Status
Duplicate
   
Status
Needs Info from Developers
   
Status
Needs Information from User
   
Status
Needs Triage
   
Status
Resolved
  
Type
Bug
   
Type
Design
   
Type
Known Issue
   
Type
Patch
   
Type
Report
   
Type
To Do
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset Browser
Interest
Asset Browser Project Overview
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE & Viewport
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Virtual Reality
Interest
Vulkan
Interest: Wayland
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
EEVEE & Viewport
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Priority
High
Priority
Low
Priority
Normal
Priority
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
Milestone
Set milestone
Clear milestone
No items
No Milestone
Projects
Set Project
Clear projects
No project
Assignees
Assign users
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#105420
There is no content yet.
Delete Branch "pioverfour/blender:dp_disambiguate"

Deleting a branch is permanent. Although the deleted branch may exist for a short time before cleaning up, in most cases it CANNOT be undone. Continue?