mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-18 09:12:18 +00:00
i18n: plural forms and contexts the catalogs could only work around
The last translation review left four kinds of problem it could only
reword around in the catalogs. They are fixed in the code now, and the
catalogs go back to natural wording.
- Counts shown with plain t() are tn() plurals: the wildlife count, the
Data Library "Showing {shown} of {total}", the News time window (which
offers 1 h) and the GhostMaps event age (which offers 1 day). The
English keys stay; the catalogs get real forms, as in "Última 1 h" and
"Últimas 24 h", or "1 Tag" and "7 Tage".
- The bridge radar range and ring spacing are tn() plurals too. The
spacing is fractional at the short ranges, and Intl.PluralRules gives
0.75 and 1.5 their own form: ru "0,75 МОР. МИЛИ", "12 МОР. МИЛЬ".
- Street level no longer passes "the view centre" or "this spot" as
{place}: each case has a message of its own, so a preposition no
longer meets a phrase in the wrong case. The progress line had the
same leak and showed the English phrase.
- Latest, FOCUS, CONFIRMED and "{label} · COURSE {heading}°" are split
with a context where one key served two places: the News heading, the
orbital site status, the Wildlife chip and a ship's course.
"CURRENTLY OVER" ended in a preposition that a country name in the
nominative cannot follow in uk, de, it and pt. It reads "under the
satellite" there now, as ru already did.
I18N.md gains the two rules behind these fixes.
This commit is contained in:
1 parent
42540ad85e
commit
209b135ff1
37 files changed
+1124
-196
No files matched your search
@@ -7,6 +7,7 @@ import assert from 'node:assert/strict';
|
||||
import { createPinia } from 'pinia';
|
||||
import { createApp, defineComponent, h, nextTick } from 'vue';
|
||||
import { CockpitViewController } from './cockpitController.js';
|
||||
import { setLocale } from '../i18n/index.js';
|
||||
import { useCockpitStore } from './stores/cockpit.js';
|
||||
import CockpitView from './views/CockpitView.vue';
|
||||
import ContextView from './views/ContextView.vue';
|
||||
@@ -355,6 +356,33 @@ test('the bridge radar shows nearby ships without its own and steps its range',
|
||||
assert.ok(!$('#cockpit-radar') || $('#cockpit-radar').hidden);
|
||||
});
|
||||
|
||||
test('the radar range and ring spacing agree with their distance (ru)', async (t) => {
|
||||
const { $, cockpit } = fixture(t);
|
||||
t.after(() => setLocale('en'));
|
||||
setLocale('ru');
|
||||
cockpit.enter();
|
||||
await settle();
|
||||
const shown = () => [
|
||||
$('#cockpit-radar-range').textContent.trim(),
|
||||
$('.cockpit-radar-rings').textContent.trim(),
|
||||
];
|
||||
// The ring spacing is a fraction at the short ranges: Intl.PluralRules
|
||||
// gives 0.75 and 1.5 the form of their own.
|
||||
const expected = [
|
||||
['3 МОР. МИЛИ', 'КОЛЬЦА 0,75 МОР. МИЛИ'],
|
||||
['6 МОР. МИЛЬ', 'КОЛЬЦА 1,5 МОР. МИЛИ'],
|
||||
['12 МОР. МИЛЬ', 'КОЛЬЦА 3 МОР. МИЛИ'],
|
||||
['24 МОР. МИЛИ', 'КОЛЬЦА 6 МОР. МИЛЬ'],
|
||||
];
|
||||
for (const [index, labels] of expected.entries()) {
|
||||
if (index) {
|
||||
$('#cockpit-radar-range').click();
|
||||
await settle();
|
||||
}
|
||||
assert.deepEqual(shown(), labels);
|
||||
}
|
||||
});
|
||||
|
||||
test('contact navigation does not jump ship from the bridge', async (t) => {
|
||||
const { cockpit, navigations } = fixture(t);
|
||||
cockpit.enter();
|
||||
@@ -1201,6 +1229,18 @@ test('a ship with no true heading is held, and labelled, on its course', async (
|
||||
signals.some(([, , , detail]) => /COURSE 095°/.test(detail)),
|
||||
JSON.stringify(signals),
|
||||
);
|
||||
// A ship's course has a word of its own: pt RUMO, an aircraft's CURSO.
|
||||
t.after(() => setLocale('en'));
|
||||
setLocale('pt');
|
||||
signals.length = 0;
|
||||
cockpit.exit();
|
||||
await settle();
|
||||
cockpit.enter();
|
||||
await settle();
|
||||
assert.ok(
|
||||
signals.some(([, , , detail]) => /· RUMO 095°$/.test(detail)),
|
||||
JSON.stringify(signals),
|
||||
);
|
||||
});
|
||||
|
||||
test('both entries name the subject the same way', async () => {
|
||||
|
||||
Reference in new issue
Block a user