Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion frontend/android/wear/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<string name="set_of">Satz %1$d von %2$d</string>
<string name="sets">Sätze</string>
<string name="sets_of">%1$d von %2$d Sätzen</string>
<string name="skip">Überspringen</string>
<string name="skip">Weiter</string>
<string name="skip_set">Satz überspringen</string>
<string name="skip_set_q">Diesen Satz überspringen?</string>
<string name="skipped_waiting">Ein übersprungener Satz wartet noch.</string>
Expand Down
4 changes: 3 additions & 1 deletion frontend/android/wear/wear-strings.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const LANGS = {
// resource name → the app's key, for words the app already has.
const FROM_APP = {
today: 'Today', start_workout: 'Start workout', done: 'Done', warmup: 'Warm-up', reps: 'Reps',
rest: 'Rest', skip: 'Skip', finish_workout: 'Finish workout', finish_workout_q: 'Finish workout?',
rest: 'Rest', finish_workout: 'Finish workout', finish_workout_q: 'Finish workout?',
finish_and_save: 'Finish and save', discard_workout: 'Discard workout', continue_workout: 'Continue workout',
cancel: 'Cancel', rest_over: 'Rest’s over. Next set!', left: 'Left', right: 'Right', bodyweight: 'Bodyweight',
superset: 'Superset', weight: 'Weight', sets: 'Sets', volume: 'Volume', time: 'Time', skip_set: 'Skip set',
Expand All @@ -55,6 +55,8 @@ const COMPOSED = {
// resource name → the Apple Watch's key (its %@ and %lld become Android's %1$s / %1$d).
const FROM_WATCH = {
avg: 'avg', no_effort_yet: 'No effort rated yet',
// The Apple Watch's word, shorter than the app's in German ("Weiter", #1400).
skip: 'Skip',
no_workout: 'No workout running', not_synced: 'Not synced yet', all_sets_done: 'All sets done',
set_of: 'Set %lld of %lld', sets_of: '%lld of %lld sets', hold: 'Hold',
stop: 'Stop', start_hold: 'Start hold', workout_saved: 'Workout saved', added_weight: 'Added weight',
Expand Down
2 changes: 1 addition & 1 deletion frontend/ios/App/Watch/de.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"Warm-up" = "Aufwärmen";
"Reps" = "Wdh.";
"Rest" = "Pause";
"Skip" = "Überspringen";
"Skip" = "Weiter";
"Finish workout" = "Training beenden";
"Discard workout" = "Training verwerfen";
"Continue workout" = "Weitertrainieren";
Expand Down
2 changes: 1 addition & 1 deletion frontend/ios/App/WatchWidgets/de.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"Warm-up" = "Aufwärmen";
"Reps" = "Wdh.";
"Rest" = "Pause";
"Skip" = "Überspringen";
"Skip" = "Weiter";
"Finish workout" = "Training beenden";
"Discard workout" = "Training verwerfen";
"Continue workout" = "Weitertrainieren";
Expand Down
7 changes: 6 additions & 1 deletion frontend/ios/ci/watch-strings.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@ const FROM_APP = {
// watch-apple: the rest's ‹ (VoiceOver), the phone's word.
'Back': 'Back',
}
// The watch's own word where the app's is too long for its buttons; every other language keeps the app's.
const SHORTER = {
// #1400: "Überspringen" barely fits between −15 and +15; the owner picked "Weiter".
'Skip': { de: 'Weiter' },
}
// Built from an app word: "Last time: %@".
const COMPOSED = {
'Last time: %@': ['Last time', w => `${w}: %@`],
Expand Down Expand Up @@ -334,7 +339,7 @@ for (const [pack, lproj] of Object.entries(LANGS)) {
if (/—/.test(v)) { console.error(`${lproj}: em dash in "${k}"`); problems++ }
lines.push(`"${esc(k)}" = "${esc(v)}";`)
}
for (const [k, appKey] of Object.entries(FROM_APP)) put(k, dict[appKey])
for (const [k, appKey] of Object.entries(FROM_APP)) put(k, SHORTER[k]?.[lproj] || dict[appKey])
for (const [k, [appKey, f]] of Object.entries(COMPOSED)) put(k, dict[appKey] && f(dict[appKey]))
for (const [k, tr] of Object.entries(OWN)) put(k, tr[lproj])
mkdirSync(join(out, `${lproj}.lproj`), { recursive: true })
Expand Down
Loading