scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-05-17 08:10:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions2

use custom-defined internal separator

Browse source 
There is some stacking that happens in object keys that had been using the `-` to track language/view hierarchies, which was thrown off by view names that used a `-` in them. Switch to using `:`, and also make it customizable. Fixes
This commit is contained in:
Matthew Taylor 2016-07-01 14:27:41 -04:00
parent c25852b3c6
commit ce9b3561f2
1 changed files with 12 additions and 6 deletions

18
bin/lib/locale-compare.js
View file

@ -76,12 +76,14 @@ Helpers.getMD5Map = function (ICUIdMap) {
* key: '<react-intl string id>' * key: '<react-intl string id>'
* value: translated version of string * value: translated version of string
*/ */
Helpers.getTranslationsForLanguage = function (lang, idsWithICU, md5WithIds) { Helpers.getTranslationsForLanguage = function (lang, idsWithICU, md5WithIds, separator) {
var poUiDir = path.resolve(__dirname, '../../node_modules/scratchr2_translations/ui'); var poUiDir = path.resolve(__dirname, '../../node_modules/scratchr2_translations/ui');
var jsFile = path.resolve(poUiDir, lang + '/LC_MESSAGES/djangojs.po'); var jsFile = path.resolve(poUiDir, lang + '/LC_MESSAGES/djangojs.po');
var pyFile = path.resolve(poUiDir, lang + '/LC_MESSAGES/django.po'); var pyFile = path.resolve(poUiDir, lang + '/LC_MESSAGES/django.po');
var translations = {}; var translations = {};
separator = separator || ':';
try { try {
fs.accessSync(jsFile, fs.R_OK); fs.accessSync(jsFile, fs.R_OK);
var jsTranslations = po2icu.poFileToICUSync(lang, jsFile); var jsTranslations = po2icu.poFileToICUSync(lang, jsFile);
@ -104,7 +106,7 @@ Helpers.getTranslationsForLanguage = function (lang, idsWithICU, md5WithIds) {
var translationsByView = {}; var translationsByView = {};
for (var id in translations) { for (var id in translations) {
var ids = id.split('-'); // [viewName, stringId] var ids = id.split(separator); // [viewName, stringId]
var viewName = ids[0]; var viewName = ids[0];
var stringId = ids[1]; var stringId = ids[1];
@ -127,20 +129,24 @@ Helpers.writeTranslationsToJS = function (outputDir, viewName, translationObject
// Returns a FormattedMessage id with english string as value. Use for default values in translations // Returns a FormattedMessage id with english string as value. Use for default values in translations
// Sample structure: { 'general-general.blah': 'blah', 'about-about.blah': 'blahblah' } // Sample structure: { 'general-general.blah': 'blah', 'about-about.blah': 'blahblah' }
Helpers.idToICUMap = function (viewName, ids) { Helpers.idToICUMap = function (viewName, ids, separator) {
var idsToICU = {}; var idsToICU = {};
separator = separator || ':';
for (var id in ids) { for (var id in ids) {
idsToICU[viewName + '-' + id] = ids[id]; idsToICU[viewName + separator + id] = ids[id];
} }
return idsToICU; return idsToICU;
}; };
// Reuturns reverse (i.e. english string with message key as the value) object for searching po files. // Reuturns reverse (i.e. english string with message key as the value) object for searching po files.
// Sample structure: { 'blah': 'general-general.blah', 'blahblah': 'about-about.blah' } // Sample structure: { 'blah': 'general-general.blah', 'blahblah': 'about-about.blah' }
Helpers.icuToIdMap = function (viewName, ids) { Helpers.icuToIdMap = function (viewName, ids, separator) {
var icuToIds = {}; var icuToIds = {};
separator = separator || ':';
for (var id in ids) { for (var id in ids) {
icuToIds[ids[id]] = viewName + '-' + id; icuToIds[ids[id]] = viewName + separator + id;
} }
return icuToIds; return icuToIds;
}; };