Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add French support to NumberPrompt #1489

Closed
wants to merge 6 commits into from
Closed

add French support to NumberPrompt #1489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a4d6612
add French support to NumberPrompt
Dec 9, 2019
b16efe5
Merge branch 'master' into frenchToNumberPrompt
mdrichardson Dec 9, 2019
716d94b
Merge branch 'master' into frenchToNumberPrompt
Bill7zz Dec 10, 2019
758d751
Merge branch 'master' into frenchToNumberPrompt
cleemullins Dec 31, 2019
c7ec915
Merge branch 'master' into frenchToNumberPrompt
cleemullins Jan 13, 2020
d2d9be9
force rebuild
Jan 13, 2020
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: 3 additions & 1 deletion libraries/botbuilder-dialogs/scripts/gen-cldr-data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
/*
import * as Chinese from 'cldr-data/main/zh/numbers.json';
import * as English from 'cldr-data/main/en/numbers.json';
import * as French from 'cldr-data/main/fr/numbers.json';
import * as Dutch from 'cldr-data/main/nl/numbers.json';
import * as German from 'cldr-data/main/de/numbers.json';
import * as Japanese from 'cldr-data/main/ja/numbers.json';
Expand Down Expand Up @@ -37,6 +38,7 @@ const cldrDataPackageVersion = '35.1.0';
const numbersDirectoryPaths = [
'main/zh',
'main/en',
'main/fr',
'main/nl',
'main/de',
'main/ja',
Expand Down
3 changes: 2 additions & 1 deletion libraries/botbuilder-dialogs/src/i18n.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/
const Chinese = require('../vendor/cldr-data/main/zh/numbers.json');
const English = require('../vendor/cldr-data/main/en/numbers.json');
const French = require('../vendor/cldr-data/main/fr/numbers.json');
const German = require('../vendor/cldr-data/main/de/numbers.json');
const Dutch = require('../vendor/cldr-data/main/nl/numbers.json');
const Japanese = require('../vendor/cldr-data/main/ja/numbers.json');
Expand All @@ -15,4 +16,4 @@ const NumberingSystem = require('../vendor/cldr-data/supplemental/numberingSyste
const Portuguese = require('../vendor/cldr-data/main/pt/numbers.json');
const Spanish = require('../vendor/cldr-data/main/es/numbers.json');

export { Chinese, English, German, Dutch, Japanese, LikelySubtags, NumberingSystem, Portuguese, Spanish }
export { Chinese, English, French, German, Dutch, Japanese, LikelySubtags, NumberingSystem, Portuguese, Spanish }
4 changes: 2 additions & 2 deletions libraries/botbuilder-dialogs/src/prompts/numberPrompt.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import * as Recognizers from '@microsoft/recognizers-text-number';
import { Activity, InputHints, TurnContext } from 'botbuilder-core';
import { Prompt, PromptOptions, PromptRecognizerResult, PromptValidator } from './prompt';

import { Chinese, Dutch, English, German, Japanese, LikelySubtags, NumberingSystem, Portuguese, Spanish } from "../i18n";
import { Chinese, Dutch, English, French, German, Japanese, LikelySubtags, NumberingSystem, Portuguese, Spanish } from "../i18n";

import * as Globalize from 'globalize';
Globalize.load(
Chinese, English, Dutch, German, Japanese, LikelySubtags, NumberingSystem, Portuguese, Spanish
Chinese, English, Dutch, French, German, Japanese, LikelySubtags, NumberingSystem, Portuguese, Spanish
);

/**
Expand Down
157 changes: 157 additions & 0 deletions libraries/botbuilder-dialogs/vendor/cldr-data/main/fr/numbers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
{
"main": {
"fr": {
"identity": {
"version": {
"_number": "$Revision: 14982 $",
"_cldrVersion": "35.1"
},
"language": "fr"
},
"numbers": {
"defaultNumberingSystem": "latn",
"otherNumberingSystems": {
"native": "latn"
},
"minimumGroupingDigits": "1",
"symbols-numberSystem-latn": {
"decimal": ",",
"group": " ",
"list": ";",
"percentSign": "%",
"plusSign": "+",
"minusSign": "-",
"exponential": "E",
"superscriptingExponent": "×",
"perMille": "‰",
"infinity": "∞",
"nan": "NaN",
"timeSeparator": ":"
},
"decimalFormats-numberSystem-latn": {
"standard": "#,##0.###",
"long": {
"decimalFormat": {
"1000-count-one": "0 millier",
"1000-count-other": "0 mille",
"10000-count-one": "00 mille",
"10000-count-other": "00 mille",
"100000-count-one": "000 mille",
"100000-count-other": "000 mille",
"1000000-count-one": "0 million",
"1000000-count-other": "0 millions",
"10000000-count-one": "00 million",
"10000000-count-other": "00 millions",
"100000000-count-one": "000 million",
"100000000-count-other": "000 millions",
"1000000000-count-one": "0 milliard",
"1000000000-count-other": "0 milliards",
"10000000000-count-one": "00 milliard",
"10000000000-count-other": "00 milliards",
"100000000000-count-one": "000 milliard",
"100000000000-count-other": "000 milliards",
"1000000000000-count-one": "0 billion",
"1000000000000-count-other": "0 billions",
"10000000000000-count-one": "00 billion",
"10000000000000-count-other": "00 billions",
"100000000000000-count-one": "000 billion",
"100000000000000-count-other": "000 billions"
}
},
"short": {
"decimalFormat": {
"1000-count-one": "0 k",
"1000-count-other": "0 k",
"10000-count-one": "00 k",
"10000-count-other": "00 k",
"100000-count-one": "000 k",
"100000-count-other": "000 k",
"1000000-count-one": "0 M",
"1000000-count-other": "0 M",
"10000000-count-one": "00 M",
"10000000-count-other": "00 M",
"100000000-count-one": "000 M",
"100000000-count-other": "000 M",
"1000000000-count-one": "0 Md",
"1000000000-count-other": "0 Md",
"10000000000-count-one": "00 Md",
"10000000000-count-other": "00 Md",
"100000000000-count-one": "000 Md",
"100000000000-count-other": "000 Md",
"1000000000000-count-one": "0 Bn",
"1000000000000-count-other": "0 Bn",
"10000000000000-count-one": "00 Bn",
"10000000000000-count-other": "00 Bn",
"100000000000000-count-one": "000 Bn",
"100000000000000-count-other": "000 Bn"
}
}
},
"scientificFormats-numberSystem-latn": {
"standard": "#E0"
},
"percentFormats-numberSystem-latn": {
"standard": "#,##0 %"
},
"currencyFormats-numberSystem-latn": {
"currencySpacing": {
"beforeCurrency": {
"currencyMatch": "[:^S:]",
"surroundingMatch": "[:digit:]",
"insertBetween": " "
},
"afterCurrency": {
"currencyMatch": "[:^S:]",
"surroundingMatch": "[:digit:]",
"insertBetween": " "
}
},
"standard": "#,##0.00 ¤",
"accounting": "#,##0.00 ¤;(#,##0.00 ¤)",
"short": {
"standard": {
"1000-count-one": "0 k ¤",
"1000-count-other": "0 k ¤",
"10000-count-one": "00 k ¤",
"10000-count-other": "00 k ¤",
"100000-count-one": "000 k ¤",
"100000-count-other": "000 k ¤",
"1000000-count-one": "0 M ¤",
"1000000-count-other": "0 M ¤",
"10000000-count-one": "00 M ¤",
"10000000-count-other": "00 M ¤",
"100000000-count-one": "000 M ¤",
"100000000-count-other": "000 M ¤",
"1000000000-count-one": "0 Md ¤",
"1000000000-count-other": "0 Md ¤",
"10000000000-count-one": "00 Md ¤",
"10000000000-count-other": "00 Md ¤",
"100000000000-count-one": "000 Md ¤",
"100000000000-count-other": "000 Md ¤",
"1000000000000-count-one": "0 Bn ¤",
"1000000000000-count-other": "0 Bn ¤",
"10000000000000-count-one": "00 Bn ¤",
"10000000000000-count-other": "00 Bn ¤",
"100000000000000-count-one": "000 Bn ¤",
"100000000000000-count-other": "000 Bn ¤"
}
},
"unitPattern-count-one": "{0} {1}",
"unitPattern-count-other": "{0} {1}"
},
"miscPatterns-numberSystem-latn": {
"approximately": "≈{0}",
"atLeast": "≥{0}",
"atMost": "≤{0}",
"range": "{0}–{1}"
},
"minimalPairs": {
"pluralMinimalPairs-count-one": "{0} jour",
"pluralMinimalPairs-count-other": "{0} jours",
"one": "Prenez la {0}re à droite.",
"other": "Prenez la {0}e à droite."
}
}
}
}
}