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
4 changes: 4 additions & 0 deletions common/i18n.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export const createTranslator = (dictionary = {}) => (key) => {
return dictionary[key] ?? key;
};

48 changes: 25 additions & 23 deletions html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,29 @@
{{ themes }}
</style>
</head>
<body>
<div data-name="js-fm" class="fm">{{ fm }}</div>
<div id="js-keyspanel" class="keyspanel">
<button id=f1 class="cmd-button reduce-text icon-help" title="Help" >F1</button>
<button id=f2 class="cmd-button reduce-text icon-user-menu" title="User Menu" >F2</button>
<button id=f3 class="cmd-button reduce-text icon-view" title="View" >F3</button>
<button id=f4 class="cmd-button reduce-text icon-edit " title="Edit" >F4</button>
<button id=f5 class="cmd-button reduce-text icon-copy" title="Copy" >F5</button>
<button id=f6 class="cmd-button reduce-text icon-move" title="Move" >F6</button>
<button id=f7 class="cmd-button reduce-text icon-directory" title="New Directory" >F7</button>
<button id=f8 class="cmd-button reduce-text icon-delete" title="Delete" >F8</button>
<button id=f9 class="cmd-button reduce-text icon-menu" title="Menu" >F9</button>
<button id=f10 class="cmd-button reduce-text icon-config" title="Config" >F10</button>
<button id=~ class="cmd-button reduce-text icon-console" title="Console" >~</button>
<button id=shift~ class="cmd-button reduce-text icon-terminal" title="Terminal" >⇧ ~</button>
<button id=contact class="cmd-button reduce-text icon-contact" title="Contact" ></button>
</div>
<script src="{{ prefix }}/dist/cloudcmd.common.js"></script>
<script src="{{ prefix }}/dist/cloudcmd.js"></script>
<script>
CloudCmd({{ config }});
</script>
</body>
<body>
<div data-name="js-fm" class="fm">{{ fm }}</div>
<div id="js-keyspanel" class="keyspanel">
<button id="f1" class="cmd-button reduce-text icon-help" title="Help" >F1</button>
<button id="f2" class="cmd-button reduce-text icon-user-menu" title="User Menu" >F2</button>
<button id="f3" class="cmd-button reduce-text icon-view" title="View" >F3</button>
<button id="f4" class="cmd-button reduce-text icon-edit " title="Edit" >F4</button>
<button id="f5" class="cmd-button reduce-text icon-copy" title="Copy" >F5</button>
<button id="f6" class="cmd-button reduce-text icon-move" title="Move" >F6</button>
<button id="f7" class="cmd-button reduce-text icon-directory" title="New Directory" >F7</button>
<button id="f8" class="cmd-button reduce-text icon-delete" title="Delete" >F8</button>
<button id="f9" class="cmd-button reduce-text icon-menu" title="Menu" >F9</button>
<button id="f10" class="cmd-button reduce-text icon-config" title="Config" >F10</button>
<button id="~" class="cmd-button reduce-text icon-console" title="Console" >~</button>
<button id="shift~" class="cmd-button reduce-text icon-terminal" title="Terminal" >⌥ ~</button>
<button id="contact" class="cmd-button reduce-text icon-contact" title="Contact" ></button>
</div>
<script src="{{ prefix }}/dist/cloudcmd.common.js"></script>
<script src="{{ prefix }}/dist/cloudcmd.js"></script>
<script>
globalThis.i18n = {{ i18n }};
CloudCmd({{ config }});
</script>
</body>
</html>

29 changes: 18 additions & 11 deletions server/cloudcmd.js
Original file line number Diff line number Diff line change
Expand Up @@ -192,52 +192,59 @@ function cloudcmdMiddle({modules, config}) {
const diff = apart(config, 'diff');
const zip = apart(config, 'zip');
const root = apart(config, 'root');

const prefix = config('prefix'); // <-- DODAJ TĘ LINIĘ
const dropboxToken = config('dropboxToken');

const ponseStatic = ponse.createStatic({
cache,
root: DIR_ROOT,
});

const dropbox = config('dropbox');
const dropboxToken = config('dropboxToken');

const cutPrefix = (middleware) => (req, res, next) => {
if (prefix && req.url.startsWith(prefix)) {
req.url = req.url.replace(prefix, '') || '/';
}
middleware(req, res, next);
};

const funcs = clean([
config('console') && konsole({
online,
}),
config('terminal') && terminal(config, {}),
edward({
cutPrefix(edward({
root,
online,
diff,
zip,
dropbox,
dropboxToken,
}),
dword({
})),
cutPrefix(dword({
root,
online,
diff,
zip,
dropbox,
dropboxToken,
}),
qword({
})),
cutPrefix(qword({
root,
online,
diff,
zip,
dropbox,
dropboxToken,
}),
deepword({
})),
cutPrefix(deepword({
root,
online,
diff,
zip,
dropbox,
dropboxToken,
}),
})),
fileop(),
nomine(),
setUrl,
Expand Down
23 changes: 23 additions & 0 deletions server/i18n.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import {readFileSync as nativeReadFileSync} from 'node:fs';
import {join, dirname} from 'node:path';
import {fileURLToPath} from 'node:url';
import tryCatch from 'try-catch';

const __dirname = dirname(fileURLToPath(import.meta.url));

export const readTranslations = (lang, {readFileSync = nativeReadFileSync} = {}) => {
const paths = [
join(__dirname, '..', 'json', 'i18n', `${lang}.json`),
join(__dirname, '..', 'json', 'i18n', 'en.json'),
];

for (const dictPath of paths) {
const [error, jsonString] = tryCatch(readFileSync, dictPath, 'utf8');

if (!error && jsonString) {
return JSON.parse(jsonString);
}
}

return {};
};
32 changes: 32 additions & 0 deletions server/i18n.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import {test, stub} from 'supertape';
import {readTranslations} from './i18n.js';

test('cloudcmd: server: i18n: readTranslations: success', (t) => {
const readFileSync = stub().returns(JSON.stringify({
hello: 'world',
}));

Comment thread
Yabi23 marked this conversation as resolved.
const result = readTranslations('pl', {readFileSync});
const expected = {hello: 'world'};

t.deepEqual(result, expected);
t.end();
});

test('cloudcmd: server: i18n: readTranslations: fallback on error', (t) => {
let called = false;
const readFileSync = stub(() => {
if (!called) {
called = true;
throw Error('ENOENT: no such file or directory');
}
return JSON.stringify({hello: 'fallback'});
});

const result = readTranslations('pl', {readFileSync});
const expected = {hello: 'fallback'};

t.deepEqual(result, expected);
t.end();
});

10 changes: 10 additions & 0 deletions server/route.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,13 @@ import {contentType} from 'mime-types';
import * as CloudFunc from '#common/cloudfunc';
import root from './root.js';
import prefixer from './prefixer.js';
import {readTranslations} from './i18n.js';
import Template from './template.js';
import {getColumns} from './columns.js';
import {getThemes} from './theme.js';
import {readFileSync} from 'node:fs';
import {join, dirname} from 'node:path';
import {fileURLToPath} from 'node:url';

const require = createRequire(import.meta.url);
const {stringify} = JSON;
Expand Down Expand Up @@ -163,6 +167,10 @@ function indexProcessing(config, options) {

const name = config('name');

const __dirname = dirname(fileURLToPath(import.meta.url));
const lang = config('lang') || 'en';
const i18nPack = readTranslations(lang);

data = rendy(data, {
title: CloudFunc.getTitle({
name,
Expand All @@ -172,9 +180,11 @@ function indexProcessing(config, options) {
config: stringify(config('*')),
columns: getColumns()[config('columns')],
themes: getThemes()[config('theme')],

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

i18n must be passed here, like everything else

i18n: stringify(i18nPack) || '{}', // <-- Przywrócono czysty stringify
});

return data;

}

function buildIndex(config, html, data) {
Expand Down
24 changes: 24 additions & 0 deletions test-e2e/client/i18n.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import {test} from '@cloudcmd/test-e2e';

test('should inject i18n into index.html during bootstrap', async ({page}) => {
const i18nPack = await page.evaluate(() => globalThis.i18n);

const isObject = typeof i18nPack === 'object' && i18nPack !== null;
if (!isObject)
throw Error('i18n is not an object');
});

test('should use injected i18n translations on client-side', async ({page}) => {
await page.evaluate(() => {
globalThis.i18n = {
'F2 - Rename': 'F2 - Zmień nazwę',
};
});

const translation = await page.evaluate(() => {
return globalThis.i18n['F2 - Rename'];
});

if (translation !== 'F2 - Zmień nazwę')
throw Error('Client-side translation fallback failed');
});
Loading