Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

i18n improved: dotted path -> dot-notation #6317

Merged
merged 11 commits into from
Apr 18, 2024
Merged

Conversation

math-GH
Copy link
Contributor

@math-GH math-GH commented Apr 17, 2024

Ref. #5662
see discussion there #5662 (comment)

Changes proposed in this pull request:

  • dotted path -> dot-notation
  • dotted path -> dot-notated

Pull request checklist:

  • clear commit messages
  • code manually tested

@math-GH math-GH added the I18n 🌍 Translations label Apr 17, 2024
@math-GH math-GH added this to the 1.24.0 milestone Apr 17, 2024
app/i18n/fr/sub.php Outdated Show resolved Hide resolved
@@ -127,12 +127,12 @@
'xpath' => 'XPath for:', // TODO
),
'json_dotpath' => array(
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we rename the key json_dotpath too? (f.e. json_dotnotation?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, good idea

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.
But there are much more "dotpath" attributes/variables

Copy link
Member

@Frenzie Frenzie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd keep them as is typical in English, meaning dot notation, not dot-notation or dotnotation.

app/i18n/en/sub.php Outdated Show resolved Hide resolved
app/i18n/en/sub.php Outdated Show resolved Hide resolved
app/i18n/en/sub.php Outdated Show resolved Hide resolved
@math-GH
Copy link
Contributor Author

math-GH commented Apr 17, 2024

@Frenzie I would agree that dot notation is better than dot-notation but I checked via Google the term and dot-notation is used very often.
IMHO: I do not care which one is "better".

@math-GH math-GH mentioned this pull request Apr 17, 2024
@Frenzie
Copy link
Member

Frenzie commented Apr 17, 2024

I checked via Google the term and dot-notation is used very often.

Note that the ESLint configuration for example uses dot-notation as opposed to dot_notation or dotNotation but all of those refer to "dot notation".

app/i18n/fr/sub.php Outdated Show resolved Hide resolved
app/i18n/fr/sub.php Outdated Show resolved Hide resolved
app/i18n/fr/sub.php Outdated Show resolved Hide resolved
app/i18n/nl/sub.php Outdated Show resolved Hide resolved
app/i18n/nl/sub.php Outdated Show resolved Hide resolved
app/i18n/nl/sub.php Outdated Show resolved Hide resolved
app/i18n/nl/sub.php Outdated Show resolved Hide resolved
math-GH and others added 7 commits April 17, 2024 22:21
Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>
Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>
Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>
Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>
@Alkarex
Copy link
Member

Alkarex commented Apr 18, 2024

I think we should update the name of the file app/Utils/dotpathUtil.php accordingly

@math-GH
Copy link
Contributor Author

math-GH commented Apr 18, 2024

I think we should update the name of the file app/Utils/dotpathUtil.php accordingly

could we merge this PR first and do the refactoring in another PR? It would reduce double work for the translators :)

@Frenzie
Copy link
Member

Frenzie commented Apr 18, 2024

Fine by me, and better for future git blame really, though I'm not really sure what difference it'd make to the translations?

@math-GH
Copy link
Contributor Author

math-GH commented Apr 18, 2024

Fine by me, and better for future git blame really, though I'm not really sure what difference it'd make to the translations?

right now they translate dotted path into their language and not dot notation.
That is the reason why #6313 is waiting for merging this PR first

@Alkarex Alkarex merged commit 3261b7b into FreshRSS:edge Apr 18, 2024
2 checks passed
@math-GH math-GH deleted the dotnotation branch April 18, 2024 12:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
I18n 🌍 Translations
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants