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

Fixed: "tag" -> "label" #4770

Merged
merged 5 commits into from Oct 24, 2022
Merged

Fixed: "tag" -> "label" #4770

merged 5 commits into from Oct 24, 2022

Conversation

math-GH
Copy link
Contributor

@math-GH math-GH commented Oct 24, 2022

Before:
When a label is created the notification calls it a "tag".
grafik

Edit user queries:
grafik

Changes proposed in this pull request:

  • English i18n: "label" -> "tag"
  • German: improved
  • some other languages: commented the line as // DIRTY

How to test the feature manually:

  1. check how it is called in the language:

  2. go to "Label management" (./p/i/?c=tag)

  3. Create a new label

  4. see the notification

  5. Create/edit a user query

  6. see the filter list

Pull request checklist:

  • clear commit messages
  • code manually tested

@math-GH math-GH added the I18n 🌍 Translations label Oct 24, 2022
@math-GH math-GH added this to the 1.20.1 milestone Oct 24, 2022
@math-GH
Copy link
Contributor Author

math-GH commented Oct 24, 2022

Ping @Frenzie : Please check the Dutch. I labeled some lines as DIRTY

@aledeg
Copy link
Member

aledeg commented Oct 24, 2022

Shouldn't we also modify the action to reflect that?

@aledeg
Copy link
Member

aledeg commented Oct 24, 2022

I think, this modification should be added also on the translation key to avoid confusion.

@math-GH
Copy link
Contributor Author

math-GH commented Oct 24, 2022

Shouldn't we also modify the action to reflect that?

It would be a bigger refactoring. Also the i18n keys need a renaming.

Here I just wanted to fix the text for 1.20.1

@aledeg
Copy link
Member

aledeg commented Oct 24, 2022

Ok then. But could you open an issue to reflect the changes I was mentioning earlier?

app/i18n/nl/conf.php Outdated Show resolved Hide resolved
app/i18n/nl/feedback.php Outdated Show resolved Hide resolved
Alkarex and others added 2 commits October 25, 2022 00:20
Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>
Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>
@Alkarex Alkarex merged commit 45f6d84 into FreshRSS:edge Oct 24, 2022
@math-GH math-GH deleted the fix-tag-label-text branch October 31, 2022 21:21
math-GH added a commit to math-GH/FreshRSS that referenced this pull request Nov 15, 2022
* tag -> label (all english texts)

* tag -> label (German)

* marked as DIRTY

* Update app/i18n/nl/feedback.php

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

* Update app/i18n/nl/conf.php

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants