github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update error handling in i18n core plugin

Browse source
This commit is contained in:
Martin Hickey 2016-06-24 15:30:27 +01:00
parent 856fb0200f
commit c5d22bede1
2 changed files with 83 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/plugins/i18n/server/i18n.js
View file

@ -15,6 +15,8 @@ module.exports = {
var translationFileName = language + '.' + TRANSLATION_FILE_EXTENSION;
module.exports.getPluginTranslationDetails(pluginTranslationPath, translationFiles, languageList, function (err) {
if (err) return cb (err);
var langSupported = false;
for (var langIndx in languageList) {
if (language === languageList[langIndx]) {
@ -22,7 +24,11 @@ module.exports = {
break;
}
}
if (langSupported) {
if (!langSupported) {
return cb(Error(language + ' language is not supported in ' + pluginName + ' plugin.'));
}
try {
if (!fs.existsSync(translationStorePluginPath)) {
createDirectoriesRecursively(translationStorePluginPath);
}
@ -35,6 +41,8 @@ module.exports = {
var fileToWrite = translationStorePluginPath + '/' + translationFileName;
saveTranslationToFile(fileToWrite, translationJson);
}
} catch (err) {
return cb(err);
}
});
@ -47,12 +55,22 @@ module.exports = {
var translationFile = translationStorePluginPath + '/' + translationFileName;
fs.readFile(translationFile, function (err, translationStr) {
if (err) return callback(err);
return callback(null, JSON.parse(translationStr));
var translationJson = [];
try {
translationJson = JSON.parse(translationStr);
} catch (e) {
return callback('Bad ' + language + ' translation strings for plugin ' + pluginName + '. Error: ' + err);
}
return callback(null, translationJson);
});
},
getPluginTranslationDetails: function (pluginTranslationPath, translationFiles, languageList, callback) {
getFilesRecursivelyFromTopDir(pluginTranslationPath, translationFiles, languageList);
try {
getFilesRecursivelyFromTopDir(pluginTranslationPath, translationFiles, languageList);
} catch (err) {
return callback(err);
}
return callback(null);
},

99
src/plugins/i18n/server/tests/i18n_tests.js
View file

@ -11,16 +11,21 @@ describe('Test plugin translations details for test_plugin_1', function () {
var result = true;
var expectedLanguages = ['en', 'de'];
getPluginTranslationLanguages(pluginName, pluginTranslationPath, function (err, actualLanguages) {
if (actualLanguages.length !== expectedLanguages.length) {
if (err) {
console.log(err);
result = false;
} else {
var index = actualLanguages.length;
actualLanguages.sort();
expectedLanguages.sort();
while (index--) {
if (actualLanguages[index] !== expectedLanguages[index]) {
result = false;
break;
if (actualLanguages.length !== expectedLanguages.length) {
result = false;
} else {
var index = actualLanguages.length;
actualLanguages.sort();
expectedLanguages.sort();
while (index--) {
if (actualLanguages[index] !== expectedLanguages[index]) {
result = false;
break;
}
}
}
}
@ -33,16 +38,21 @@ describe('Test plugin translations details for test_plugin_1', function () {
var result = true;
var expectedLanguages = ['de'];
getPluginTranslationLanguages(pluginName, pluginTranslationPath, function (err, actualLanguages) {
if (actualLanguages.length !== expectedLanguages.length) {
if (err) {
console.log(err);
result = false;
} else {
var index = actualLanguages.length;
actualLanguages.sort();
expectedLanguages.sort();
while (index--) {
if (actualLanguages[index] !== expectedLanguages[index]) {
result = false;
break;
if (actualLanguages.length !== expectedLanguages.length) {
result = false;
} else {
var index = actualLanguages.length;
actualLanguages.sort();
expectedLanguages.sort();
while (index--) {
if (actualLanguages[index] !== expectedLanguages[index]) {
result = false;
break;
}
}
}
}
@ -59,16 +69,21 @@ describe('Test plugin translations details for test_plugin_1', function () {
pluginTranslationPath + '/view2/en.json'
];
getPluginTranslationFiles(pluginName, pluginTranslationPath, function (err, actualFiles) {
if (actualFiles.length !== expectedFiles.length) {
if (err) {
console.log(err);
result = false;
} else {
var index = actualFiles.length;
actualFiles.sort();
expectedFiles.sort();
while (index--) {
if (actualFiles[index] !== expectedFiles[index]) {
result = false;
break;
if (actualFiles.length !== expectedFiles.length) {
result = false;
} else {
var index = actualFiles.length;
actualFiles.sort();
expectedFiles.sort();
while (index--) {
if (actualFiles[index] !== expectedFiles[index]) {
result = false;
break;
}
}
}
}
@ -87,15 +102,25 @@ describe('Test storing translations for test_plugin_1', function () {
var language = 'en';
i18n.storePluginLanguageTranslations(pluginName, pluginTranslationPath, language, function (err) {
var expectedTranslationJsonFile = __dirname + '/data/reference/' + pluginName + '/' + language + '.json';
var expectedTranslationJson = require(expectedTranslationJsonFile);
expectedTranslationJson = JSON.stringify(expectedTranslationJson);
i18n.getPluginLanguageTranslation(pluginName, language, function (err, actualTranslationJson) {
actualTranslationJson = JSON.stringify(actualTranslationJson);
if (actualTranslationJson !== expectedTranslationJson) {
result = false;
}
});
if (err) {
console.log(err);
result = false;
} else {
var expectedTranslationJsonFile = __dirname + '/data/reference/' + pluginName + '/' + language + '.json';
var expectedTranslationJson = require(expectedTranslationJsonFile);
expectedTranslationJson = JSON.stringify(expectedTranslationJson);
i18n.getPluginLanguageTranslation(pluginName, language, function (err, actualTranslationJson) {
if (err) {
console.log(err);
result = false;
} else {
actualTranslationJson = JSON.stringify(actualTranslationJson);
if (actualTranslationJson !== expectedTranslationJson) {
result = false;
}
}
});
}
expect(result).to.be(true);
done();
});
@ -103,10 +128,8 @@ describe('Test storing translations for test_plugin_1', function () {
afterEach(function (done) {
var translationPluginStorePath = i18n.getPluginTranslationStoragePath('test_plugin_1');
process.exec('rm -rf ' + translationPluginStorePath, function (err,stdout,stderr) {
if (err) throw err;
done();
});
process.execSync('rm -rf ' + translationPluginStorePath);
done();
});
});
@ -114,6 +137,7 @@ function getPluginTranslationLanguages(pluginName, pluginTranslationPath, cb) {
var translationFiles = [];
var languageList = [];
i18n.getPluginTranslationDetails(pluginTranslationPath, translationFiles, languageList, function (err) {
if (err) return cb(err);
return cb(null, languageList);
});
}
@ -122,6 +146,7 @@ function getPluginTranslationFiles(pluginName, pluginTranslationPath, cb) {
var translationFiles = [];
var languageList = [];
i18n.getPluginTranslationDetails(pluginTranslationPath, translationFiles, languageList, function (err) {
if (err) return cb(err);
return cb(null, translationFiles);
});
}