Keep @modifiers when parsing locales #947

madduck · 2023-01-18T11:16:49Z

Locale modifiers ("@Variants") are described in the GNU gettext documentation like this:

The ‘@variant’ can denote any kind of characteristics that is not
already implied by the language ll and the country CC. […] It can also
denote a dialect of the language, …

Wherein Babel previously would discard these, this patch stores the modifier information in the Locale objects, handling string representation accordingly.

Not implemented is the lookup of a meaningful description of modifiers, but instead — for now — an identity mapping is provided.

All tests pass. Furthermore, integration with flask-babel has been verified to work.

Resolves: #946
Signed-off-by: martin f. krafft [email protected]

akx

Thank you for the contribution!
Some initial thoughts and comments within; you'll probably also need to rebase since #949 just landed...

babel/core.py

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

madduck · 2023-01-20T22:15:46Z

@akx Thank you for your time. I addressed most of your comments, and left an open question in the above. Happy to proceed any way, just let me know what you prefer.

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

akx

Thanks for implementing the suggested changes!

There's a couple more comments within, but I think we're pretty close. Thanks :)

babel/core.py

codecov · 2023-01-25T18:42:54Z

Codecov Report

Merging #947 (83188f0) into master (6bf793a) will decrease coverage by 0.02%.
The diff coverage is 93.10%.

@@            Coverage Diff             @@
##           master     #947      +/-   ##
==========================================
- Coverage   90.91%   90.89%   -0.02%     
==========================================
  Files          25       25              
  Lines        4327     4340      +13     
==========================================
+ Hits         3934     3945      +11     
- Misses        393      395       +2

Impacted Files	Coverage Δ
babel/core.py	`96.31% <93.10%> (-0.45%)`	⬇️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

akx

Tests are failing, can you take a look? Thanks.

babel/core.py

madduck · 2023-01-25T21:23:59Z

Sorry for the failing tests, was due to the 4/5 tuple return depending on modifier==None. I am not actually very sure it's a good idea, but I see your point. Fixed now.

@Variants

Locale modifiers ("@Variants") are described in the GNU gettext documentation like this: > The ‘@variant’ can denote any kind of characteristics that is not > already implied by the language ll and the country CC. […] It can also > denote a dialect of the language, … Wherein Babel previously would discard these, this patch stores the modifier information in the `Locale` objects, handling string representation accordingly. Not implemented is the lookup of a meaningful description of modifiers, but instead — for now — an identity mapping is provided. Resolves: python-babel#946 Signed-off-by: martin f. krafft <[email protected]>

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

Signed-off-by: martin f. krafft <[email protected]>

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

Signed-off-by: martin f. krafft <[email protected]>

Co-authored-by: Aarni Koskela <[email protected]>

akx

Thanks, looks good!

madduck force-pushed the keep-locale-modifiers branch from 3c3f3e8 to ae8a175 Compare January 18, 2023 21:34

akx requested changes Jan 20, 2023

View reviewed changes

madduck added a commit to madduck/babel that referenced this pull request Jan 20, 2023

Address 1st comment by @akx

d0ffe8f

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

madduck added a commit to madduck/babel that referenced this pull request Jan 20, 2023

Address comment by @agx

38d5006

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

madduck added a commit to madduck/babel that referenced this pull request Jan 20, 2023

Address comment by @akx

b72301e

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

madduck added a commit to madduck/babel that referenced this pull request Jan 20, 2023

Add additional doctest as suggested by @akx

50048bc

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

madduck added a commit to madduck/babel that referenced this pull request Jan 20, 2023

Fix tuple filling in get_locale_identitier

3f51b98

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

madduck added a commit to madduck/babel that referenced this pull request Jan 20, 2023

Address comment by @akx

ccca33b

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

madduck force-pushed the keep-locale-modifiers branch from c10d05f to ccca33b Compare January 20, 2023 22:14

madduck added a commit to madduck/babel that referenced this pull request Jan 20, 2023

Address comment by @akx

386078a

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

madduck added a commit to madduck/babel that referenced this pull request Jan 20, 2023

Address comment by @akx

d61c5cd

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

madduck added a commit to madduck/babel that referenced this pull request Jan 20, 2023

Address comment by @akx

0bc64eb

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

madduck added a commit to madduck/babel that referenced this pull request Jan 20, 2023

Add additional doctest as suggested by @akx

0e67556

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

madduck added a commit to madduck/babel that referenced this pull request Jan 20, 2023

Fix tuple filling in get_locale_identitier

4204716

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

madduck added a commit to madduck/babel that referenced this pull request Jan 20, 2023

Address comment by @akx

b5d7749

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

madduck force-pushed the keep-locale-modifiers branch from ccca33b to b5d7749 Compare January 20, 2023 22:16

madduck requested a review from akx January 21, 2023 22:00

akx requested changes Jan 25, 2023

View reviewed changes

babel/core.py Outdated Show resolved Hide resolved

babel/core.py Outdated Show resolved Hide resolved

babel/core.py Show resolved Hide resolved

babel/core.py Outdated Show resolved Hide resolved

madduck added a commit to madduck/babel that referenced this pull request Jan 25, 2023

Address comment by @akx

b0a50b9

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

madduck added a commit to madduck/babel that referenced this pull request Jan 25, 2023

Address comment by @akx

b92ec1f

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

madduck added a commit to madduck/babel that referenced this pull request Jan 25, 2023

Address comment by @akx

ba34ce4

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

madduck added a commit to madduck/babel that referenced this pull request Jan 25, 2023

Add additional doctest as suggested by @akx

4f89fdf

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

madduck added a commit to madduck/babel that referenced this pull request Jan 25, 2023

Fix tuple filling in get_locale_identitier

c32b0af

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

madduck added a commit to madduck/babel that referenced this pull request Jan 25, 2023

Address comment by @akx

7f372ec

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

madduck force-pushed the keep-locale-modifiers branch from f46d266 to 901b60f Compare January 25, 2023 20:13

madduck requested a review from akx January 25, 2023 20:13

akx added this to the Babel 2.12 milestone Jan 25, 2023

akx added the feature label Jan 25, 2023

akx requested changes Jan 25, 2023

View reviewed changes

babel/core.py Show resolved Hide resolved

madduck force-pushed the keep-locale-modifiers branch from 901b60f to 0f0ef1f Compare January 25, 2023 21:21

madduck requested a review from akx January 25, 2023 21:23

madduck and others added 12 commits January 25, 2023 22:24

Address comment by @akx

0c5b2ab

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

Address comment by @akx

9fde7e9

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

Parse empty modifier to None

9d72a72

Signed-off-by: martin f. krafft <[email protected]>

Address comment by @akx

c0b0755

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

Add additional doctest as suggested by @akx

08c48de

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

Fix tuple filling in get_locale_identitier

841dd8c

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

Address comment by @akx

d59633a

See python-babel#947 (comment) Signed-off-by: martin f. krafft <[email protected]>

Remove modifiers property for now

bf2d722

Signed-off-by: martin f. krafft <[email protected]>

only return 5-tuple when a modifier is used

6bdc360

Signed-off-by: martin f. krafft <[email protected]>

Another get_locale_identifier doctest

ebbf944

Signed-off-by: martin f. krafft <[email protected]>

Update function signature to reflect 1–5 tuple size

83188f0

Co-authored-by: Aarni Koskela <[email protected]>

madduck force-pushed the keep-locale-modifiers branch from 0f0ef1f to 83188f0 Compare January 25, 2023 21:24

akx approved these changes Jan 26, 2023

View reviewed changes

akx merged commit d019ed1 into python-babel:master Jan 26, 2023

akx mentioned this pull request Jul 18, 2024

Allow falling back to modifier-less locale data #1104

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Keep @modifiers when parsing locales #947

Keep @modifiers when parsing locales #947

madduck commented Jan 18, 2023

akx left a comment

madduck commented Jan 20, 2023

akx left a comment

codecov bot commented Jan 25, 2023 •

edited

Loading

akx left a comment

madduck commented Jan 25, 2023

akx left a comment

Keep @modifiers when parsing locales #947

Keep @modifiers when parsing locales #947

Conversation

madduck commented Jan 18, 2023

akx left a comment

Choose a reason for hiding this comment

madduck commented Jan 20, 2023

akx left a comment

Choose a reason for hiding this comment

codecov bot commented Jan 25, 2023 • edited Loading

Codecov Report

akx left a comment

Choose a reason for hiding this comment

madduck commented Jan 25, 2023

akx left a comment

Choose a reason for hiding this comment

codecov bot commented Jan 25, 2023 •

edited

Loading