scratchfoundation/scratchjr
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratchjr.git synced 2025-02-17 17:01:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3 from tmickel/localization-codes

Browse source 
Use short localization codes
This commit is contained in:
Tim Mickel 2016-01-12 15:19:13 -05:00
commit 75a36adfe4
5 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/ScratchJr/app/src/.gitignore vendored
View file

@ -1,2 +1,3 @@
/official /official
/arc
/pbs /pbs

6
editions/free/src/Settings.js
View file

@ -17,10 +17,10 @@ window.Settings = {
categoryStopColor: '#D62222', categoryStopColor: '#D62222',
paletteBlockShadowOpacity: 0.8, paletteBlockShadowOpacity: 0.8,
autoSaveInterval: 30 * 1000, autoSaveInterval: 30 * 1000,
defaultLocale: 'en-US', defaultLocale: 'en',
defaultLocaleShort: 'en', defaultLocaleShort: 'en',
supportedLocales: { supportedLocales: {
'English': 'en-US', 'English': 'en',
'Español': 'es-AR' 'Español': 'es'
} }
}; };

0
editions/free/src/localizations/en-US.json → editions/free/src/localizations/en.json
View file

0
editions/free/src/localizations/es-AR.json → editions/free/src/localizations/es.json
View file

7
src/utils/Localization.js
View file

@ -46,12 +46,13 @@ Localization.includeLocales = function () {
} else { } else {
Localization.currentLocale = localizationCookie; Localization.currentLocale = localizationCookie;
} }
var topLevel = Localization.currentLocale.split('-')[0];
// Intl locale-data // Intl locale-data
document.write('<script src="' + Localization.root + document.write('<script src="' + Localization.root +
'jssource/external/Intl/locale-data/jsonp/' + Localization.currentLocale + '.js"><\/script>'); 'jssource/external/Intl/locale-data/jsonp/' + topLevel + '.js"><\/script>');
// MessageFormat locale-data // MessageFormat locale-data
var topLevel = Localization.currentLocale.split('-')[0];
document.write('<script src="' + Localization.root + document.write('<script src="' + Localization.root +
'jssource/external/intl-messageformat/locale-data/' + topLevel + '.js"><\/script>'); 'jssource/external/intl-messageformat/locale-data/' + topLevel + '.js"><\/script>');
@ -63,7 +64,7 @@ Localization.includeLocales = function () {
// Get messages synchronously // Get messages synchronously
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open('GET', Localization.root + 'localizations/' + Localization.currentLocale + '.json', false); xhr.open('GET', Localization.root + 'localizations/' + topLevel + '.json', false);
xhr.send(null); xhr.send(null);
Localization.localizationMessages = JSON.parse(xhr.responseText); Localization.localizationMessages = JSON.parse(xhr.responseText);