mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-01 18:00:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

[i18n] Add support to escape more chars, like \s (fix #4236)

Browse Source
This commit is contained in:
David Capello 2023-12-22 11:37:04 -03:00
parent bbb6913d82
commit e2d8db92d2
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/strings/en.ini
View File

@ -501,8 +501,8 @@ copy_path = Copy &Path
[dithering_selector] [dithering_selector]
no_dithering = No Dithering no_dithering = No Dithering
old_dithering = Old Dithering+ old_dithering = Old Dithering +\s
ordered_dithering = Ordered Dithering+ ordered_dithering = Ordered Dithering +\s
floyd_steinberg = Floyd-Steinberg Error Diffusion Dithering floyd_steinberg = Floyd-Steinberg Error Diffusion Dithering
[canvas_size] [canvas_size]

22
src/app/i18n/strings.cpp
View File

@ -18,7 +18,6 @@
#include "app/xml_document.h" #include "app/xml_document.h"
#include "app/xml_exception.h" #include "app/xml_exception.h"
#include "base/fs.h" #include "base/fs.h"
#include "base/replace_string.h"
#include "cfg/cfg.h" #include "cfg/cfg.h"
#include <algorithm> #include <algorithm>
@ -161,7 +160,26 @@ void Strings::loadStringsFromFile(const std::string& fn)
textId.append(key); textId.append(key);
value = cfg.getValue(section.c_str(), key.c_str(), ""); value = cfg.getValue(section.c_str(), key.c_str(), "");
base::replace_string(value, "\\n", "\n");
// Process escaped chars (\\, \n, \s, \t, etc.)
for (int i=0; i<int(value.size()); ) {
if (value[i] == '\\') {
value.erase(i, 1);
if (i == int(value.size()))
break;
int chr = value[i];
switch (chr) {
case '\\': chr = '\\'; break;
case 'n': chr = '\n'; break;
case 't': chr = '\t'; break;
case 's': chr = ' '; break;
}
value[i] = chr;
}
else {
++i;
}
}
m_strings[textId] = value; m_strings[textId] = value;
//TRACE("I18N: Reading string %s -> %s\n", textId.c_str(), m_strings[textId].c_str()); //TRACE("I18N: Reading string %s -> %s\n", textId.c_str(), m_strings[textId].c_str());