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: German translation switches 'conversation' and 'discussion' #31595

Merged
merged 5 commits into from
Feb 9, 2024

Conversation

dieselftw
Copy link
Contributor

@dieselftw dieselftw commented Jan 31, 2024

Proposed changes (including videos or screenshots)

German translation files don't differentiate between 'Unterhaltung' (meaning entertainment / conversation) and 'Diskussion' (Discussion). This creates inconsistencies in labels and tool tips across the UI and should be streamlined.

I've replaced all appropriate occurances of the same to match the exact translation of English (and verified them using Google Translate).

If I replaced something that's inappropriate, please let me know :) I'll change it right away.

Issue(s)

Closes #31587

Steps to test or reproduce

Further comments

Copy link

changeset-bot bot commented Jan 31, 2024

⚠️ No Changeset found

Latest commit: b051570

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

Copy link

codecov bot commented Jan 31, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (f612d74) 54.39% compared to head (b051570) 49.54%.
Report is 46 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #31595      +/-   ##
===========================================
- Coverage    54.39%   49.54%   -4.86%     
===========================================
  Files         2276     3331    +1055     
  Lines        50105    81875   +31770     
  Branches     10227    16901    +6674     
===========================================
+ Hits         27253    40561   +13308     
- Misses       20369    36572   +16203     
- Partials      2483     4742    +2259     
Flag Coverage Δ
e2e 53.25% <ø> (+0.06%) ⬆️
unit 76.47% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Copy link

@david-uhlig david-uhlig left a comment

Choose a reason for hiding this comment

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

Thank you again for providing a quick fix @hardikbhatia777!

I marked three occurences where we need to use the plural. Apart from these the changes look fine to me. Could you also please change the de-IN and de-AT translation files. They have the same inconsistencies. Appreciated!

apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json Outdated Show resolved Hide resolved
apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json Outdated Show resolved Hide resolved
apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json Outdated Show resolved Hide resolved
@dieselftw dieselftw force-pushed the i18n/german-translations branch from 3fb04e0 to 0e93dd5 Compare February 1, 2024 07:43
@dieselftw
Copy link
Contributor Author

Thanks for the help @david-uhlig! I've fixed de-IN as well. de-AT seems to not have a lot of the translations for some reason? I'm guessing it's outdated as of now and needs to be synced with the english i18n file. Anyways, the main de.i18n file should be good now :) If there's any other errors you can spot, do let me know and I'll have it changed right away.

Thanks!

Copy link

@david-uhlig david-uhlig left a comment

Choose a reason for hiding this comment

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

Looks good to me! There seems to be a fallback to de.i18n.json for the missing de-AT.i18n.json lines, so this works out fine. Well done.

Copy link
Contributor

@rique223 rique223 left a comment

Choose a reason for hiding this comment

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

Great work folks. Looks good to me.

@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: needs QA labels Feb 6, 2024
@dionisio-bot dionisio-bot bot removed the stat: ready to merge PR tested and approved waiting for merge label Feb 6, 2024
@rique223 rique223 self-assigned this Feb 6, 2024
@ggazzo ggazzo merged commit cb9c6ba into RocketChat:develop Feb 9, 2024
41 of 42 checks passed
@dieselftw dieselftw deleted the i18n/german-translations branch February 21, 2024 15:03
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.

Translations: steamline discussions to either "Unterhaltung" or "Diskussion"
4 participants