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.

Sign up for GitHub

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

Jump to bottom

Fix Translations #2595

Merged
merged 13 commits into from
Mar 31, 2024
Merged

Fix Translations #2595

merged 13 commits into from
Mar 31, 2024

Conversation

Sn0w3y
Copy link
Contributor

@Sn0w3y Sn0w3y commented Mar 29, 2024

No description provided.

@github-actions GitHub Actions
Copy link

Code Coverage

sfeilmeier
sfeilmeier requested changes Mar 29, 2024
View reviewed changes
Copy link
Contributor

@sfeilmeier sfeilmeier left a comment

Choose a reason for hiding this comment

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

This breaks translations, because you did not update the actual translation files (de.json, en.json, etc.)

@Sn0w3y
Copy link
Contributor Author

Sn0w3y commented Mar 29, 2024

This breaks translations, because you did not update the actual translation files (de.json, en.json, etc.)

AFAIK in your last Backport to Fems it was already included in Uppercase @sfeilmeier

@sfeilmeier
Copy link
Contributor

No. This is in latest develop:

https://github.com/OpenEMS/openems/blob/develop/ui/src/assets/i18n/de.json#L15

  "Edge": {
    "Index": {
      "EmergencyReserve": {
        "InfoForEmergencyReserveSlider": "Durch Aktivieren kann eine Notstromreserve zwischen 5 % und 100 % der Batteriekapazität eingestellt werden.",
        "emergencyReserve": "Notstromreserve"
      },

@Sn0w3y
Copy link
Contributor Author

Sn0w3y commented Mar 29, 2024

No. This is in latest develop:

https://github.com/OpenEMS/openems/blob/develop/ui/src/assets/i18n/de.json#L15

  "Edge": {
    "Index": {
      "EmergencyReserve": {
        "InfoForEmergencyReserveSlider": "Durch Aktivieren kann eine Notstromreserve zwischen 5 % und 100 % der Batteriekapazität eingestellt werden.",
        "emergencyReserve": "Notstromreserve"
      },

Very sorry for this oversight, i don't know why i had it in Uppercase - will change it in the files and provide it again..

Again, sorry @sfeilmeier

@Sn0w3y
Copy link
Contributor Author

Sn0w3y commented Mar 29, 2024

@sfeilmeier done now ! sorry again for the inconvenience !

@github-actions GitHub Actions
Copy link

Code Coverage

@github-actions GitHub Actions
Copy link

Code Coverage

@github-actions GitHub Actions
Copy link

Code Coverage

@github-actions GitHub Actions
Copy link

Code Coverage

1 similar comment
@github-actions GitHub Actions
Copy link

Code Coverage

@github-actions GitHub Actions
Copy link

Code Coverage

@github-actions GitHub Actions
Copy link

Code Coverage

@Sn0w3y
Copy link
Contributor Author

Sn0w3y commented Mar 30, 2024

@sfeilmeier the last Commit is indeed not correct in the Develop right now :)

@github-actions GitHub Actions
Copy link

Code Coverage

@Sn0w3y Sn0w3y requested a review from sfeilmeier March 30, 2024 20:54
@github-actions GitHub Actions
Copy link

Code Coverage

@github-actions GitHub Actions
Copy link

Code Coverage

@github-actions GitHub Actions
Copy link

Code Coverage

@sfeilmeier sfeilmeier merged commit dc3d4d9 into OpenEMS:develop Mar 31, 2024
2 checks passed
@Sn0w3y Sn0w3y deleted the patch-7 branch March 31, 2024 13:59
Sn0w3y added a commit to Sn0w3y/openems that referenced this pull request Apr 8, 2024
@Sn0w3y @sfeilmeier
@miettal @samuelBloch @dependabot
Upstream Updates (#17)
5ac117c 
* UI: fix & update translations (OpenEMS#2595)

* Fix Emergency-Slider Translation
* Fix EMERGENCY_RESERVE Case Match

* Gitpod: add names+descriptions to ports (OpenEMS#2600)

* UI: add eslint:recommended and plugin:@typescript-eslint/recommended (OpenEMS#2577)

* add "eslint:recommended", "plugin:@typescript-eslint/recommended" to eslintrc
* `eslint --fix src/`

* Push version to 2024.4.0

* Start development of version 2024.5.0-SNAPSHOT

* MQTT API Controller: add optional config parameter to specify a topic prefix (OpenEMS#2553)

Co-authored-by: Stefan Feilmeier <[email protected]>

* Bump com.squareup.retrofit2:retrofit from 2.10.0 to 2.11.0 in /cnf (OpenEMS#2606)

* Bump com.squareup.retrofit2:converter-gson from 2.10.0 to 2.11.0 in /cnf

Bumps [com.squareup.retrofit2:converter-gson](https://github.com/square/retrofit) from 2.10.0 to 2.11.0.
- [Release notes](https://github.com/square/retrofit/releases)
- [Changelog](https://github.com/square/retrofit/blob/trunk/CHANGELOG.md)
- [Commits](square/retrofit@2.10.0...2.11.0)

---
updated-dependencies:
- dependency-name: com.squareup.retrofit2:converter-gson
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump com.squareup.retrofit2:adapter-rxjava3 in /cnf

Bumps [com.squareup.retrofit2:adapter-rxjava3](https://github.com/square/retrofit) from 2.10.0 to 2.11.0.
- [Release notes](https://github.com/square/retrofit/releases)
- [Changelog](https://github.com/square/retrofit/blob/trunk/CHANGELOG.md)
- [Commits](square/retrofit@2.10.0...2.11.0)

---
updated-dependencies:
- dependency-name: com.squareup.retrofit2:adapter-rxjava3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump com.squareup.retrofit2:converter-scalars in /cnf

Bumps [com.squareup.retrofit2:converter-scalars](https://github.com/square/retrofit) from 2.10.0 to 2.11.0.
- [Release notes](https://github.com/square/retrofit/releases)
- [Changelog](https://github.com/square/retrofit/blob/trunk/CHANGELOG.md)
- [Commits](square/retrofit@2.10.0...2.11.0)

---
updated-dependencies:
- dependency-name: com.squareup.retrofit2:converter-scalars
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump com.squareup.retrofit2:retrofit from 2.10.0 to 2.11.0 in /cnf

Bumps [com.squareup.retrofit2:retrofit](https://github.com/square/retrofit) from 2.10.0 to 2.11.0.
- [Release notes](https://github.com/square/retrofit/releases)
- [Changelog](https://github.com/square/retrofit/blob/trunk/CHANGELOG.md)
- [Commits](square/retrofit@2.10.0...2.11.0)

---
updated-dependencies:
- dependency-name: com.squareup.retrofit2:retrofit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update bnd

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <[email protected]>

* UI: Fix CSS in footer (OpenEMS#2594)

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Stefan Feilmeier <[email protected]>
Co-authored-by: Hiromasa Ihara <[email protected]>
Co-authored-by: samuelBloch <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
fanass-dev pushed a commit to fanass-dev/openems that referenced this pull request May 6, 2024
@Sn0w3y @fanass-dev
UI: fix & update translations (OpenEMS#2595)
ad44e5d 
* Fix Emergency-Slider Translation
* Fix EMERGENCY_RESERVE Case Match
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sfeilmeier sfeilmeier sfeilmeier approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Sn0w3y @sfeilmeier