re-order languages

and also get language for dropdown from `IntlProvider` rather than the window, so that we have one point of truth
This commit is contained in:
Matthew Taylor 2016-08-15 14:53:31 -04:00
parent 0f93d32666
commit f3de2d1d28
3 changed files with 30 additions and 28 deletions

View file

@ -1,9 +1,11 @@
{ {
"en": "English", "ab": "Аҧсшәа",
"ar": "العربية",
"an": "Aragonés", "an": "Aragonés",
"ast": "Asturianu", "ast": "Asturianu",
"id": "Bahasa Indonesia", "id": "Bahasa Indonesia",
"ms": "Bahasa Melayu", "ms": "Bahasa Melayu",
"bg": "Български",
"ca": "Català", "ca": "Català",
"cs": "Česky", "cs": "Česky",
"cy": "Cymraeg", "cy": "Cymraeg",
@ -12,65 +14,63 @@
"de": "Deutsch", "de": "Deutsch",
"yum": "Edible Scratch", "yum": "Edible Scratch",
"et": "Eesti", "et": "Eesti",
"el": "Ελληνικά",
"en": "English",
"eo": "Esperanto", "eo": "Esperanto",
"es": "Español", "es": "Español",
"eu": "Euskara", "eu": "Euskara",
"fa": "فارسی",
"fr": "Français", "fr": "Français",
"fur": "furlan", "fur": "furlan",
"ga": "Gaeilge", "ga": "Gaeilge",
"gd": "Gàidhlig", "gd": "Gàidhlig",
"gl": "Galego", "gl": "Galego",
"ko": "한국어",
"hy": "Հայերեն",
"he": "עִבְרִית",
"hi": "हिन्दी",
"hr": "Hrvatski", "hr": "Hrvatski",
"is": "Íslenska", "is": "Íslenska",
"it": "Italiano", "it": "Italiano",
"kn": "ಭಾಷೆ-ಹೆಸರು",
"rw": "Kinyarwanda", "rw": "Kinyarwanda",
"km": "សំលៀកបំពាក",
"ht": "Kreyòl", "ht": "Kreyòl",
"ku": "Kurdî", "ku": "Kurdî",
"la": "Latina", "la": "Latina",
"lv": "Latviešu", "lv": "Latviešu",
"lt": "Lietuvių", "lt": "Lietuvių",
"mk": "Македонски",
"hu": "Magyar", "hu": "Magyar",
"ml": "മലയാളം",
"mt": "Malti", "mt": "Malti",
"mr": "मराठी",
"cat": "Meow", "cat": "Meow",
"mn": "Монгол хэл",
"my": "မြန်မာဘာသာ",
"nl": "Nederlands", "nl": "Nederlands",
"ja": "日本語",
"ja-hr": "にほんご",
"nb": "Norsk Bokmål", "nb": "Norsk Bokmål",
"nn": "Norsk Nynorsk", "nn": "Norsk Nynorsk",
"uz": "Oʻzbekcha", "uz": "Oʻzbekcha",
"th": "ไทย",
"pl": "Polski", "pl": "Polski",
"pt": "Português", "pt": "Português",
"pt-br": "Português Brasileiro", "pt-br": "Português Brasileiro",
"ro": "Română", "ro": "Română",
"ru": "Русский",
"sc": "Sardu", "sc": "Sardu",
"sq": "shqiptar",
"sk": "Slovenčina", "sk": "Slovenčina",
"sl": "Slovenščina", "sl": "Slovenščina",
"sq": "shqiptar", "sr": "Српски",
"fi": "suomi", "fi": "suomi",
"sv": "Svenska", "sv": "Svenska",
"te": "తెలుగు",
"nai": "Tepehuan", "nai": "Tepehuan",
"vi": "Tiếng Việt", "vi": "Tiếng Việt",
"tr": "Türkçe", "tr": "Türkçe",
"ab": "Аҧсшәа",
"ar": "العربية",
"bg": "Български",
"el": "Ελληνικά",
"fa": "فارسی",
"he": "עִבְרִית",
"hi": "हिन्दी",
"hy": "Հայերեն",
"ja": "日本語",
"ja-hr": "にほんご",
"km": "សំលៀកបំពាក",
"kn": "ಭಾಷೆ-ಹೆಸರು",
"ko": "한국어",
"mk": "Македонски",
"ml": "മലയാളം",
"mn": "Монгол хэл",
"mr": "मराठी",
"my": "မြန်မာဘာသာ",
"ru": "Русский",
"sr": "Српски",
"te": "తెలుగు",
"th": "ไทย",
"uk": "Українська", "uk": "Українська",
"zh-cn": "简体中文", "zh-cn": "简体中文",
"zh-tw": "正體中文" "zh-tw": "正體中文"

View file

@ -1,5 +1,7 @@
var React = require('react'); var React = require('react');
var FormattedMessage = require('react-intl').FormattedMessage; var ReactIntl = require('react-intl');
var FormattedMessage = ReactIntl.FormattedMessage;
var injectIntl = ReactIntl.injectIntl;
var FooterBox = require('../container/footer.jsx'); var FooterBox = require('../container/footer.jsx');
var LanguageChooser = require('../../languagechooser/languagechooser.jsx'); var LanguageChooser = require('../../languagechooser/languagechooser.jsx');
@ -204,7 +206,7 @@ var Footer = React.createClass({
</dl> </dl>
</div> </div>
</MediaQuery> </MediaQuery>
<LanguageChooser /> <LanguageChooser locale={this.props.intl.locale} />
<div className="copyright"> <div className="copyright">
<p> <p>
@ -216,4 +218,4 @@ var Footer = React.createClass({
} }
}); });
module.exports = Footer; module.exports = injectIntl(Footer);

View file

@ -16,7 +16,7 @@ var LanguageChooser = React.createClass({
getDefaultProps: function () { getDefaultProps: function () {
return { return {
languages: languages, languages: languages,
locale: window._locale locale: 'en'
}; };
}, },
onSetLanguage: function (name, value) { onSetLanguage: function (name, value) {