litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: convert char codes on read/write property files

Browse source
This commit is contained in:
Georgy Litvinov 2021-10-21 15:07:55 +02:00
parent 952ffa66ad
commit cdcc051d3f
1 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
webapp/src/main/webapp/js/developer/translations.js
View file

@ -116,18 +116,23 @@ class PropInfo {
var lines = this.result.split(/\r\n|\n\r|\n|\r/); var lines = this.result.split(/\r\n|\n\r|\n|\r/);
var followLine = false; var followLine = false;
var lineKey = null; var lineKey = null;
var lineValue = null;
for (var i = 0; i < lines.length; i++) { for (var i = 0; i < lines.length; i++) {
if (!isCommentLine(lines[i])) { if (!isCommentLine(lines[i])) {
if (followLine) { if (followLine) {
followLine = isNextLineFollow(lines[i]); followLine = isNextLineFollow(lines[i]);
var lineValue = lines[i].replace(/\\$/, ""); lineValue = lines[i].replace(/\\$/, "");
overridenTranslations.set(lineKey, overridenTranslations.get(lineKey) + unescapeHTML(lineValue)); lineValue = unescapeHTML(lineValue);
lineValue = charCodesToString(lineValue);
overridenTranslations.set(lineKey, overridenTranslations.get(lineKey) + lineValue);
} else { } else {
followLine = isNextLineFollow(lines[i]); followLine = isNextLineFollow(lines[i]);
lineKey = getLineKey(lines[i]); lineKey = getLineKey(lines[i]);
if (lineKey.trim() != "") { if (lineKey.trim() != "") {
let lineValue = getLineValue(lines[i]); lineValue = getLineValue(lines[i]);
overridenTranslations.set(lineKey, unescapeHTML(lineValue)); lineValue = unescapeHTML(lineValue);
lineValue = charCodesToString(lineValue);
overridenTranslations.set(lineKey, lineValue);
} }
} }
} }
@ -169,6 +174,8 @@ class PropInfo {
lineKey = getLineKey(lines[i]); lineKey = getLineKey(lines[i]);
if (overridenTranslations.has(lineKey)) { if (overridenTranslations.has(lineKey)) {
var value = overridenTranslations.get(lineKey); var value = overridenTranslations.get(lineKey);
value = toCharCodes(value);
value = escapeHTML(value);
lines[i] = lineKey + " = " + value; lines[i] = lineKey + " = " + value;
keyLineHasChanged = true; keyLineHasChanged = true;
} }
@ -185,8 +192,11 @@ class PropInfo {
var date = new Date; var date = new Date;
var fileName = "export_" + date.toLocaleString() + "_all.properties"; var fileName = "export_" + date.toLocaleString() + "_all.properties";
var lines = []; var lines = [];
var storeValue = null;
for (let [key, value] of overridenTranslations) { for (let [key, value] of overridenTranslations) {
lines.push(key + " = " + escapeHTML(value)); storeValue = toCharCodes(value);
storeValue = escapeHTML(storeValue);
lines.push(key + " = " + storeValue);
} }
saveFile(fileName, lines); saveFile(fileName, lines);
} }
@ -452,6 +462,17 @@ class PropInfo {
pageTranslations.set(key, propInfo); pageTranslations.set(key, propInfo);
} }
} }
function toCharCodes(input) {
return input
.replace(/^\ /, "\\u0020")
.replace(/\ $/, "\\u0020");
}
function charCodesToString(input) {
return input.replace(/\\u[\dA-F]{4}/gi,
function(match) {
return String.fromCharCode(parseInt(match.replace(/\\u/g, ''), 16));
});
}
function escapeHTML(input) { function escapeHTML(input) {
return input return input
.replace(/&/g, "&amp;") .replace(/&/g, "&amp;")
@ -473,6 +494,7 @@ class PropInfo {
.replace(/&rsquo;/g, "’"); .replace(/&rsquo;/g, "’");
} }
window.addEventListener('load', function() { window.addEventListener('load', function() {
setTimeout(function() { setTimeout(function() {
var developerSetting = document.getElementById("developer_i18n_onlineTranslation"); var developerSetting = document.getElementById("developer_i18n_onlineTranslation");