Skip to content

Commit 7709d4e

Browse files
committed
[FIX] Fixing key binding for Space Bar translation and localization
because of Issue in JS - Uncaught TypeError: A message must be provided as a String or AST.
1 parent ebc6a1b commit 7709d4e

File tree

9 files changed

+24
-9
lines changed

9 files changed

+24
-9
lines changed

Resources/Private/DevServer/app-config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ var lang = {
8282
"error.mastodon.invalid_link": "Invalid Link URL.",
8383
"error.mastodon.enter_url": "Please enter a Mastodon instance URL.",
8484
"key.generic": "{key}",
85-
"key. ": "Space Bar",
85+
"key.Space": "Space Bar",
8686
"key.ArrowDown": "\u25bc",
8787
"key.ArrowLeft": "\u25c0",
8888
"key.ArrowRight": "\u25b6",

Resources/Private/JavaScript/SlubMediaPlayer/keybindings.test.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ describe('format translated key description', () => {
1616
locale: 'en_US',
1717
twoLetterIsoCode: 'en',
1818
phrases: {
19+
'key.Space': 'Space Bar',
1920
'key.ArrowRight': "Arrow Right",
2021
'key.generic': "Key {key}",
2122
'key.generic.mod': "{key}",
@@ -26,6 +27,15 @@ describe('format translated key description', () => {
2627
},
2728
});
2829

30+
test('space bar translation', () => {
31+
const kb = keybindings.find(kb =>
32+
kb.action === 'playback.toggle' &&
33+
kb.keys.includes(' ')
34+
);
35+
const text = getKeybindingText(env, /** @type {any} */(kb));
36+
expect(text.innerHTML).toBe('<kbd>Space Bar</kbd>');
37+
});
38+
2939
test('key S for opening screenshot modal', () => {
3040
const kb = keybindings.find(kb => kb.action === 'modal.screenshot.open');
3141
const text = getKeybindingText(env, /** @type {any} */(kb));

Resources/Private/JavaScript/SlubMediaPlayer/lib/trans.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ import { Keybinding$splitKeyRanges } from 'lib/Keyboard';
1212
* @returns {string}
1313
*/
1414
export function getKeyText(env, key, mod) {
15+
// Space Bar is a special case
16+
if (key === ' ') {
17+
key = 'Space';
18+
}
19+
1520
const app = mod ? '.mod' : '';
1621
return env.t(`key.${key}${app}`, {},
1722
() => env.t(`key.${key}`, {},

Resources/Private/Language/de.locallang_media.xlf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,9 +321,9 @@
321321
<source><![CDATA[{key}]]></source>
322322
<target><![CDATA[{key}]]></target>
323323
</trans-unit>
324-
<trans-unit id="key. " approved="yes">
324+
<trans-unit id="key.Space" approved="yes">
325325
<source><![CDATA[Space Bar]]></source>
326-
<target><![CDATA[ ]]></target>
326+
<target><![CDATA[Leertaste]]></target>
327327
</trans-unit>
328328
<trans-unit id="key.ArrowDown" approved="yes">
329329
<source><![CDATA[]]></source>

Resources/Private/Language/locallang_media.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@
242242
<trans-unit id="key.generic">
243243
<source><![CDATA[{key}]]></source>
244244
</trans-unit>
245-
<trans-unit id="key. ">
245+
<trans-unit id="key.Space">
246246
<source><![CDATA[Space Bar]]></source>
247247
</trans-unit>
248248
<trans-unit id="key.ArrowDown">

Resources/Public/Css/DlfMediaPlayerStyles.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Resources/Public/Css/DlfMediaVendor.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Resources/Public/JavaScript/DlfMediaPlayer/DlfMediaPlayer.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Resources/Public/JavaScript/DlfMediaPlayer/DlfMediaVendor.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)