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

remove additional whitespace in some strings.

Browse source
This commit is contained in:
Enno Rehling 2018-05-19 13:34:00 +02:00
parent e5218781d6
commit 4154b1c3d9
4 changed files with 131 additions and 130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
res/translations/strings.de.po
View file

@ -17,9 +17,7 @@ msgstr "Rostiges Kettenhemd"
msgctxt "spellinfo" msgctxt "spellinfo"
msgid "destroy_magic" msgid "destroy_magic"
msgstr "" msgstr ""
"Dieser Zauber ermöglicht dem Magier, Verzauberungen " "Dieser Zauber ermöglicht dem Magier, Verzauberungen einer Einheit, eines Schiffes, Gebäudes oder auch der Region aufzulösen."
"einer Einheit, eines Schiffes, Gebäudes oder auch "
"der Region aufzulösen."
msgctxt "spell" msgctxt "spell"
msgid "shadowknights" msgid "shadowknights"
@ -168,9 +166,6 @@ msgstr "TRÄNKE"
msgid "northwest" msgid "northwest"
msgstr "Nordwesten" msgstr "Nordwesten"
msgid "spinx09"
msgstr "Das Schiff mit dem Stern im Wappen liegt neben dem der einen Mandelkern hat"
msgctxt "iteminfo" msgctxt "iteminfo"
msgid "cookie" msgid "cookie"
msgstr "Kleines trockenes Dauergebäck, m od. s; - u. -es, - u. -e" msgstr "Kleines trockenes Dauergebäck, m od. s; - u. -es, - u. -e"

6
src/report.c
View file

@ -1037,6 +1037,9 @@ void report_region(struct stream *out, const region * r, faction * f)
if (wrptr(&bufp, &size, bytes) != 0) if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER(); WARN_STATIC_BUFFER();
if (is_mourning(r, turn + 1)) { if (is_mourning(r, turn + 1)) {
bytes = (int)str_strlcpy(bufp, " ", size);
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
bytes = (int)str_strlcpy(bufp, LOC(f->locale, "nr_mourning"), size); bytes = (int)str_strlcpy(bufp, LOC(f->locale, "nr_mourning"), size);
if (wrptr(&bufp, &size, bytes) != 0) if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER(); WARN_STATIC_BUFFER();
@ -1877,6 +1880,9 @@ nr_building(struct stream *out, const region *r, const building *b, const factio
} }
if (!building_finished(b)) { if (!building_finished(b)) {
bytes = (int)str_strlcpy(bufp, " ", size);
if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER();
bytes = (int)str_strlcpy(bufp, LOC(lang, "nr_building_inprogress"), size); bytes = (int)str_strlcpy(bufp, LOC(lang, "nr_building_inprogress"), size);
if (wrptr(&bufp, &size, bytes) != 0) if (wrptr(&bufp, &size, bytes) != 0)
WARN_STATIC_BUFFER(); WARN_STATIC_BUFFER();

6
src/util/strings.c
View file

@ -111,7 +111,8 @@ size_t str_slprintf(char * dst, size_t size, const char * format, ...)
return (size_t)result; return (size_t)result;
} }
void str_replace(char *buffer, size_t size, const char *tmpl, const char *var, const char *value) void str_replace(char *buffer, size_t size, const char *tmpl, const char *var,
const char *value)
{ {
size_t val_len = strlen(value); size_t val_len = strlen(value);
size_t var_len = strlen(var); size_t var_len = strlen(var);
@ -154,8 +155,7 @@ int str_hash(const char *s)
return key & 0x7FFFFFFF; return key & 0x7FFFFFFF;
} }
const char *str_escape(const char *str, char *buffer, const char *str_escape(const char *str, char *buffer, size_t len)
size_t len)
{ {
const char *handle_start = strchr(str, '\"'); const char *handle_start = strchr(str, '\"');
if (!handle_start) handle_start = strchr(str, '\\'); if (!handle_start) handle_start = strchr(str, '\\');