zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gettext: fill in empty msgstrs from msgid.

pull/106/head
whitequark 2017-01-11 01:23:59 +00:00
parent 0eb33decd1
commit aeebc3c395
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/resource.cpp
View File

@ -1435,10 +1435,14 @@ Translation Translation::From(const std::string &poData) {
const std::string &Translation::Translate(const TranslationKey &key) { const std::string &Translation::Translate(const TranslationKey &key) {
auto it = messages.find(key); auto it = messages.find(key);
if(it == messages.end()) { if(it == messages.end()) {
dbp("Missing translation for %s'%s'", key.context.c_str(), key.ident.c_str()); dbp("Missing (absent) translation for %s'%s'", key.context.c_str(), key.ident.c_str());
messages[key].emplace_back(key.ident); messages[key].emplace_back(key.ident);
it = messages.find(key); it = messages.find(key);
} }
if(it->second[0].empty()) {
dbp("Missing (empty) translation for %s'%s'", key.context.c_str(), key.ident.c_str());
it->second[0] = key.ident;
}
if(it->second.size() != 1) { if(it->second.size() != 1) {
dbp("Incorrect use of translated message %s'%s'", key.context.c_str(), key.ident.c_str()); dbp("Incorrect use of translated message %s'%s'", key.context.c_str(), key.ident.c_str());
ssassert(false, "Using a message with a plural form without a number"); ssassert(false, "Using a message with a plural form without a number");
@ -1447,15 +1451,21 @@ const std::string &Translation::Translate(const TranslationKey &key) {
} }
const std::string &Translation::TranslatePlural(const TranslationKey &key, unsigned n) { const std::string &Translation::TranslatePlural(const TranslationKey &key, unsigned n) {
unsigned pluralForm = PluralExpr::Eval(pluralExpr, n);
auto it = messages.find(key); auto it = messages.find(key);
if(it == messages.end()) { if(it == messages.end()) {
dbp("Missing translation for %s'%s'", key.context.c_str(), key.ident.c_str()); dbp("Missing (absent) translation for %s'%s'", key.context.c_str(), key.ident.c_str());
for(unsigned i = 0; i < pluralCount; i++) { for(unsigned i = 0; i < pluralCount; i++) {
messages[key].emplace_back(key.ident); messages[key].emplace_back(key.ident);
} }
it = messages.find(key); it = messages.find(key);
} }
unsigned pluralForm = PluralExpr::Eval(pluralExpr, n); if(it->second[pluralForm].empty()) {
dbp("Missing (empty) translation for %s'%s'[%d]",
key.context.c_str(), key.ident.c_str(), pluralForm);
it->second[pluralForm] = key.ident;
}
return it->second[pluralForm]; return it->second[pluralForm];
} }