Skip to content

Commit

Permalink
Merge pull request #16690 from schlawg/ui-french-language-voice-move
Browse files Browse the repository at this point in the history 
enable Français (expérimental) voice move
  • Loading branch information
@ornicar
ornicar authored Dec 29, 2024
2 parents 73d62bc + f7d92ae commit 3dd1582
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 50 deletions.
130 changes: 85 additions & 45 deletions ui/voice/grammar/move-fr.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@
"in": "partie null",
"val": "draw",
"tags": ["command", "round"],
"tok": "WX"
"tok": "XY"
},
{
"in": "abandonner",
Expand Down Expand Up @@ -402,13 +402,13 @@
"in": "pouces vers le haut",
"val": "upvote",
"tags": ["command", "puzzle"],
"tok": "YZU["
"tok": "Z[V\\"
},
{
"in": "pouces vers le bas",
"val": "downvote",
"tags": ["command", "puzzle"],
"tok": "YZU\\"
"tok": "Z[V]"
},
{
"in": "solution",
Expand Down Expand Up @@ -450,7 +450,7 @@
"in": "arrête d'écouter",
"val": "mic-off",
"tags": ["command"],
"tok": "]^"
"tok": "^_"
},
{
"in": "oui",
Expand Down Expand Up @@ -488,11 +488,35 @@
}
]
},
{
"in": "bleue",
"val": "blue",
"tags": ["color", "choice"],
"tok": ">",
"subs": [
{
"to": "",
"cost": 0.5
}
]
},
{
"in": "vert",
"val": "green",
"tags": ["color", "choice"],
"tok": "?",
"subs": [
{
"to": "",
"cost": 0.5
}
]
},
{
"in": "verte",
"val": "green",
"tags": ["color", "choice"],
"tok": ">",
"tok": "@",
"subs": [
{
"to": "",
Expand All @@ -504,7 +528,7 @@
"in": "jaune",
"val": "yellow",
"tags": ["color", "choice"],
"tok": "?",
"tok": "A",
"subs": [
{
"to": "",
Expand All @@ -516,7 +540,7 @@
"in": "rouge",
"val": "red",
"tags": ["color", "choice"],
"tok": "@",
"tok": "C",
"subs": [
{
"to": "",
Expand All @@ -528,7 +552,7 @@
"in": "rose",
"val": "pink",
"tags": ["color", "choice"],
"tok": "A",
"tok": "D",
"subs": [
{
"to": "",
Expand All @@ -537,10 +561,10 @@
]
},
{
"in": "violette",
"in": "violet",
"val": "purple",
"tags": ["color", "choice"],
"tok": "C",
"tok": "E",
"subs": [
{
"to": "",
Expand All @@ -549,10 +573,10 @@
]
},
{
"in": "orange",
"val": "orange",
"in": "violette",
"val": "purple",
"tags": ["color", "choice"],
"tok": "D",
"tok": "F",
"subs": [
{
"to": "",
Expand All @@ -561,10 +585,10 @@
]
},
{
"in": "brun",
"val": "brown",
"in": "orange",
"val": "orange",
"tags": ["color", "choice"],
"tok": "E",
"tok": "G",
"subs": [
{
"to": "",
Expand All @@ -573,10 +597,10 @@
]
},
{
"in": "blanc",
"val": "white",
"in": "marron",
"val": "brown",
"tags": ["color", "choice"],
"tok": "F",
"tok": "H",
"subs": [
{
"to": "",
Expand All @@ -588,7 +612,7 @@
"in": "alfa",
"val": "a",
"tags": ["file", "move", "phonetic"],
"tok": "G",
"tok": "I",
"subs": [
{
"to": "",
Expand All @@ -600,7 +624,7 @@
"in": "bravo",
"val": "b",
"tags": ["file", "move", "phonetic"],
"tok": "H",
"tok": "J",
"subs": [
{
"to": "",
Expand All @@ -612,7 +636,7 @@
"in": "charlie",
"val": "c",
"tags": ["file", "move", "phonetic"],
"tok": "I",
"tok": "L",
"subs": [
{
"to": "",
Expand All @@ -624,7 +648,7 @@
"in": "delta",
"val": "d",
"tags": ["file", "move", "phonetic"],
"tok": "J",
"tok": "M",
"subs": [
{
"to": "",
Expand All @@ -636,7 +660,7 @@
"in": "echo",
"val": "e",
"tags": ["file", "move", "phonetic"],
"tok": "L",
"tok": "O",
"subs": [
{
"to": "",
Expand All @@ -645,22 +669,16 @@
]
},
{
"in": "fox-trot",
"in": "faux trot",
"val": "f",
"tags": ["file", "move", "phonetic"],
"tok": "M",
"subs": [
{
"to": "",
"cost": 0.5
}
]
"tok": "`i"
},
{
"in": "golf",
"val": "g",
"tags": ["file", "move", "phonetic"],
"tok": "O",
"tok": "S",
"subs": [
{
"to": "",
Expand All @@ -672,7 +690,7 @@
"in": "hotel",
"val": "h",
"tags": ["file", "move", "phonetic"],
"tok": "S",
"tok": "T",
"subs": [
{
"to": "",
Expand All @@ -684,7 +702,7 @@
"in": "uh",
"val": "",
"tags": ["ignore"],
"tok": "T",
"tok": "U",
"subs": [
{
"to": "",
Expand All @@ -696,7 +714,7 @@
"in": "le",
"val": "",
"tags": ["ignore"],
"tok": "U",
"tok": "V",
"subs": [
{
"to": "",
Expand All @@ -708,7 +726,7 @@
"in": "la",
"val": "",
"tags": ["ignore"],
"tok": "V",
"tok": "W",
"subs": [
{
"to": "",
Expand All @@ -718,7 +736,7 @@
},
{
"in": "partie",
"tok": "W",
"tok": "X",
"tags": ["part"],
"subs": [
{
Expand All @@ -729,7 +747,7 @@
},
{
"in": "null",
"tok": "X",
"tok": "Y",
"tags": ["part"],
"subs": [
{
Expand All @@ -740,7 +758,7 @@
},
{
"in": "pouces",
"tok": "Y",
"tok": "Z",
"tags": ["part"],
"subs": [
{
Expand All @@ -751,7 +769,7 @@
},
{
"in": "vers",
"tok": "Z",
"tok": "[",
"tags": ["part"],
"subs": [
{
Expand All @@ -762,7 +780,7 @@
},
{
"in": "haut",
"tok": "[",
"tok": "\\",
"tags": ["part"],
"subs": [
{
Expand All @@ -773,7 +791,7 @@
},
{
"in": "bas",
"tok": "\\",
"tok": "]",
"tags": ["part"],
"subs": [
{
Expand All @@ -784,7 +802,7 @@
},
{
"in": "arrête",
"tok": "]",
"tok": "^",
"tags": ["part"],
"subs": [
{
Expand All @@ -795,7 +813,29 @@
},
{
"in": "d'écouter",
"tok": "^",
"tok": "_",
"tags": ["part"],
"subs": [
{
"to": "",
"cost": 0.5
}
]
},
{
"in": "faux",
"tok": "`",
"tags": ["part"],
"subs": [
{
"to": "",
"cost": 0.5
}
]
},
{
"in": "trot",
"tok": "i",
"tags": ["part"],
"subs": [
{
Expand Down
8 changes: 5 additions & 3 deletions ui/voice/lexicon/move-fr-lex.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,23 @@
{ "in": "non", "val": "no", "tags": ["choice"] },

{ "in": "bleu", "val": "blue", "tags": ["color", "choice"] },
{ "in": "bleue", "val": "blue", "tags": ["color", "choice"] },
{ "in": "vert", "val": "green", "tags": ["color", "choice"] },
{ "in": "verte", "val": "green", "tags": ["color", "choice"] },
{ "in": "jaune", "val": "yellow", "tags": ["color", "choice"] },
{ "in": "rouge", "val": "red", "tags": ["color", "choice"] },
{ "in": "rose", "val": "pink", "tags": ["color", "choice"] },
{ "in": "violet", "val": "purple", "tags": ["color", "choice"] },
{ "in": "violette", "val": "purple", "tags": ["color", "choice"] },
{ "in": "orange", "val": "orange", "tags": ["color", "choice"] },
{ "in": "brun", "val": "brown", "tags": ["color", "choice"] },
{ "in": "blanc", "val": "white", "tags": ["color", "choice"] },
{ "in": "marron", "val": "brown", "tags": ["color", "choice"] },

{ "in": "alfa", "val": "a", "tags": ["file", "move", "phonetic"] },
{ "in": "bravo", "val": "b", "tags": ["file", "move", "phonetic"] },
{ "in": "charlie", "val": "c", "tags": ["file", "move", "phonetic"] },
{ "in": "delta", "val": "d", "tags": ["file", "move", "phonetic"] },
{ "in": "echo", "val": "e", "tags": ["file", "move", "phonetic"] },
{ "in": "fox-trot", "val": "f", "tags": ["file", "move", "phonetic"] },
{ "in": "faux trot", "val": "f", "tags": ["file", "move", "phonetic"] },
{ "in": "golf", "val": "g", "tags": ["file", "move", "phonetic"] },
{ "in": "hotel", "val": "h", "tags": ["file", "move", "phonetic"] },

Expand Down
6 changes: 4 additions & 2 deletions ui/voice/src/voice.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ export * from './interfaces';
export * from './move/interfaces';
export { renderVoiceBar } from './view';

export const supportedLangs: [string, string][] = [['en', 'English']];
export const supportedLangs: [string, string][] = [
['en', 'English'],
['fr', 'Français (expérimental)'],
];

if (site.debug)
supportedLangs.push(
['fr', 'Français'],
['de', 'Deutsch'],
['tr', 'Türkçe'],
['vi', 'Tiếng Việt'],
Expand Down

0 comments on commit 3dd1582

Please sign in to comment.