Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

put keywords into a namespace before giving them english keys (tbd).

This commit is contained in:
Enno Rehling 2014-06-16 18:45:32 -07:00
parent 249a4390c4
commit 27374a9329
5 changed files with 9 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/res/de/strings.xml
View File

@ -2108,6 +2108,7 @@
</string>
</namespace>
<namespace name="keyword">
<!--Befehle -->
<string name="//">
<text locale="de">//</text>
@ -2206,10 +2207,6 @@
<string name="NACH">
<text locale="de">NACH</text>
</string>
<string name="XONTORMIA">
<text locale="de">XONTORMIA</text>
<text locale="en">XONTORMIA</text>
</string>
<string name="ALLIANZ">
<text locale="de">ALLIANZ</text>
<text locale="en">ALLIANCE</text>
@ -2228,9 +2225,6 @@
<string name="PRAEFIX">
<text locale="de">PRÄFIX</text>
</string>
<string name="SYNONYM">
<text locale="de">SYNONYM</text>
</string>
<string name="INFO">
<text locale="de">INFO</text>
</string>
@ -2328,15 +2322,7 @@
<string name="SORTIEREN">
<text locale="de">SORTIEREN</text>
</string>
<string name="JIHAD">
<text locale="de">JIHAD</text>
</string>
<string name="GM">
<text locale="de">GM</text>
</string>
<string name="WERWESEN">
<text locale="de">WERWESEN</text>
</string>
</namespace>
<!--NR generieren -->
<string name="nr_options">

14
core/res/en/strings.xml
View File

@ -1380,6 +1380,7 @@
</string>
</namespace>
<namespace name="keyword">
<!-- Keywords -->
<string name="//">
<text locale="en">//</text>
@ -1441,18 +1442,12 @@
<string name="FORSCHEN">
<text locale="en">RESEARCH</text>
</string>
<string name="GM">
<text locale="en">GM</text>
</string>
<string name="GRUPPE">
<text locale="en">GROUP</text>
</string>
<string name="HELFEN">
<text locale="en">HELP</text>
</string>
<string name="JIHAD">
<text locale="en">JIHAD</text>
</string>
<string name="KAMPFZAUBER">
<text locale="en">COMBATSPELL</text>
</string>
@ -1531,9 +1526,6 @@
<string name="STIRB">
<text locale="en">QUIT</text>
</string>
<string name="SYNONYM">
<text locale="en">SYNONYM</text>
</string>
<string name="TARNEN">
<text locale="en">HIDE</text>
</string>
@ -1570,9 +1562,7 @@
<string name="ZUECHTEN">
<text locale="en">GROW</text>
</string>
<string name="WERWESEN">
<text locale="en">LYCANTROPE</text>
</string>
</namespace>
<!-- NR generieren -->
<string name="nr_options">

11
core/res/fr/strings.xml
View File

@ -1388,6 +1388,7 @@
</string>
</namespace>
<namespace name="keyword">
<!-- Keywords -->
<string name="//">
<text locale="fr">//</text>
@ -1449,18 +1450,12 @@
<string name="FORSCHEN">
<text locale="fr">CHERCHER</text>
</string>
<string name="GM">
<text locale="fr">GM</text>
</string>
<string name="GRUPPE">
<text locale="fr">GROUPER</text>
</string>
<string name="HELFEN">
<text locale="fr">AIDER</text>
</string>
<string name="JIHAD">
<text locale="fr">JIHAD</text>
</string>
<string name="KAMPFZAUBER">
<text locale="fr">PREPARER</text>
</string>
@ -1578,9 +1573,7 @@
<string name="ZÜCHTEN">
<text locale="fr">ACCROITRE</text>
</string>
<string name="WERWESEN">
<text locale="fr">METAMORPHOSE</text>
</string>
</namespace>
<namespace name="race">
<string name="vampunicorn_p">

4
src/keyword.c
View File

@ -13,7 +13,7 @@
static const char * keyword_key(int i)
{
assert(i<MAXKEYWORDS&& i>=0);
return keywords[i];
return mkname("keyword", keywords[i]);
}
void init_keyword(const struct locale *lang, keyword_t kwd, const char *str) {
@ -78,7 +78,7 @@ bool keyword_disabled(keyword_t kwd) {
const char *keywords[MAXKEYWORDS] = {
"//",
"BANNER",
"ARBEITEN",
"work",
"ATTACKIEREN",
"BEKLAUEN",
"BELAGERE",

2
src/keyword.test.c
View File

@ -11,7 +11,7 @@ static void test_init_keywords(CuTest *tc) {
test_cleanup();
lang = get_or_create_locale("en");
locale_setstring(lang, "NACH", "MOVE");
locale_setstring(lang, "keyword::NACH", "MOVE");
init_keywords(lang);
CuAssertIntEquals(tc, K_MOVE, get_keyword("move", lang));
test_cleanup();