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

fix: add new i18n keys, data management page and Update de.json #969

Merged
merged 9 commits into from
Mar 2, 2024
Merged

fix: add new i18n keys, data management page and Update de.json #969

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cf27e11
Merge pull request #432 from WatWowMap/develop
ReuschelCGN Feb 27, 2024
076fd99
Update de.json
ReuschelCGN Feb 27, 2024
fe63684
Update en.json
ReuschelCGN Feb 27, 2024
50a3e05
Update de.json
ReuschelCGN Feb 27, 2024
2aafb42
Update ResetFilters.jsx
ReuschelCGN Feb 27, 2024
21c4790
Update ResetGeneral.jsx
ReuschelCGN Feb 27, 2024
990730b
Update de.json
ReuschelCGN Feb 28, 2024
dcd8ed5
Update de.json
ReuschelCGN Feb 28, 2024
fde1fe5
Update de.json
ReuschelCGN Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion packages/locales/lib/human/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,5 +704,35 @@
"gender_filters_all": "Geschlecht gilt für alle",
"and_caption": "miteinander verbunden",
"or_caption": "filtert unabhängig",
"filter_help": "Filter Hilfe"
"filter_help": "Filter Hilfe",
"kilometers": "Kilometer",
"miles": "Miles",
Copy link
Contributor

Choose a reason for hiding this comment

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

Meilen

"distance_unit": "Entfernungseinheit",
Copy link
Contributor

Choose a reason for hiding this comment

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

Maßeinheit

"data_management": "Einstellungsverwaltung",
Copy link
Contributor

Choose a reason for hiding this comment

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

Datenverwaltung

Or do you think it's more intuitive to name it like you said?

"reset_or_manage_text": "Filter komplett zurücksetzen, oder die Einstellungsverwaltung anzeigen lassen, auf der einzelne Kategorien zurückgesetzt werden können.",
"reset_audio": "Töne zurücksetzen",
"reset_all": "Alles zurücksetzen",
"reset_icons": "Icons zurücksetzen",
"reset_position": "Position zurücksetzen",
"reset_ui": "UI zurücksetzen",
"reset_options": "Optionen zurücksetzen",
"reset_menus": "Menüs zurücksetzen",
"reset_settings": "Einstellungen zurücksetzen",
"reset_general": "Allgemein",
"reset_assets": "Styles",
"reset_filters": "Filter",
"reset_pokemon": "Pokémons zurücksetzen",
Copy link
Contributor

Choose a reason for hiding this comment

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

There is no "Pokémons", only plural "Pokémon"

"reset_pokestops": "PokéStops zurücksetzen",
"reset_gyms": "Arenen zurücksetzen",
"reset_nests": "Nester zurücksetzen",
"reset_portals": "Portale zurücksetzen",
"reset_routes": "Routen zurücksetzen",
"reset_scan_areas": "Scangebiete zurücksetzen",
"reset_scan_cells": "Scanzellen zurücksetzen",
"reset_devices": "Geräte zurücksetzen",
"reset_weather": "Wetter zurücksetzen",
"reset_s2cells": "S2 Zellen zurücksetzen",
"reset_spawnpoints": "Spawnpoints zurücksetzen",
"reset_submission_cells": "Submission Zellen zurücksetzen",
"hisuian": "Hisui"
}
3 changes: 3 additions & 0 deletions packages/locales/lib/human/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,9 @@
"reset_options": "Reset Options",
"reset_menus": "Reset Menus",
"reset_settings": "Reset Settings",
"reset_general": "General",
"reset_assets": "Assets",
"reset_filters": "Filters",
"reset_pokemon": "Reset Pokémon",
"reset_pokestops": "Reset PokéStops",
"reset_gyms": "Reset Gyms",
Expand Down
4 changes: 2 additions & 2 deletions src/features/data/components/ResetFilters.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export function ResetFilters() {

return (
<ChildContainer>
<StyledSubHeader>Filters</StyledSubHeader>
<StyledSubHeader>{t('reset_filters')}</StyledSubHeader>
{Object.keys(filters)
.filter((perm) => perms[perm])
.map((/** @type {import('@rm/types').Categories} */ key) => (
Expand All @@ -38,7 +38,7 @@ export function ResetFilters() {
<StyledDivider />
<ButtonWithNotification
onClick={resetFilters}
label="Reset All"
label={t('reset_all')}
color="error.main"
category="filter"
all
Expand Down
4 changes: 2 additions & 2 deletions src/features/data/components/ResetGeneral.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export function ResetGeneral() {

return (
<ChildContainer>
<StyledSubHeader>General</StyledSubHeader>
<StyledSubHeader>{t('reset_general')}</StyledSubHeader>
<ButtonWithNotification
onClick={resetSettings}
label={t('reset_settings')}
Expand Down Expand Up @@ -64,7 +64,7 @@ export function ResetGeneral() {
isHovering={isHovering}
/>
<StyledDivider />
<StyledSubHeader>Assets</StyledSubHeader>
<StyledSubHeader>{t('reset_assets')}</StyledSubHeader>
<ButtonWithNotification
onClick={resetIcons}
label={t('reset_icons')}
Expand Down