Skip to content

Translation adjustments - #8152

Merged
mgallien merged 2 commits into
masterfrom
bugfix/translation-adjustments
Apr 24, 2025
Merged

Translation adjustments#8152
mgallien merged 2 commits into
masterfrom
bugfix/translation-adjustments

Conversation

@nilsding

Copy link
Copy Markdown
Member

Fixes #7962
Fixes #8149

I'm targeting this for 3.17.0 to give translators some time to adapt these strings.

@nilsding nilsding added feature: 🗣️ localization Languages, localization and translations. 3. to review labels Apr 14, 2025
@nilsding nilsding added this to the 3.17.0 milestone Apr 14, 2025
@nilsding nilsding self-assigned this Apr 14, 2025
QCOMPARE(model.userStatusEmoji(), userStatusIcon);
QCOMPARE(model.onlineStatus(), userStatusState);
QCOMPARE(model.clearAtDisplayString(), tr("1 day"));
QCOMPARE(model.clearAtDisplayString(), QStringLiteral("1 day(s)"));

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Two things:

  • I don't think that using tr is useful in tests --> replaced these with QStringLiteral()s
  • I'm also not sure if the translations are ever loaded within tests -- the various plural forms are part of those. For now I've changed these to the (s) form as it's in the code as well...

@claucambra claucambra left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM :)

@nilsding
nilsding force-pushed the bugfix/translation-adjustments branch from 9297fc4 to 83f22a2 Compare April 15, 2025 06:09
in German this ended up as "Datei Namen"/"Ordner Namen", whereas these
should be compounds instead (i.e. "Dateinamen", "Ordnernamen")

Fixes #7962

Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
Many languages have different ways of handling plurals where checking
for `n == 1` is simply not enough.

Fixes #8149

Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
@mgallien
mgallien force-pushed the bugfix/translation-adjustments branch from 83f22a2 to e529195 Compare April 24, 2025 10:39
@mgallien
mgallien merged commit 24536d7 into master Apr 24, 2025
@mgallien
mgallien deleted the bugfix/translation-adjustments branch April 24, 2025 10:39
@github-actions

Copy link
Copy Markdown
Contributor

Artifact containing the AppImage: nextcloud-appimage-pr-8152.zip

SHA256 checksum: 2e03fbeacdf65301e267db6e4f6816c0c6655dd124db321af384d4c31953657e

To test this change/fix you can download the above artifact file, unzip it, and run it.

Please make sure to quit your existing Nextcloud app and backup your data.

@sonarqubecloud

Copy link
Copy Markdown

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review feature: 🗣️ localization Languages, localization and translations.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

i18n: Plural form adjustments [Bug]: i18n: Variables do not work for e. g. Hungarian

3 participants