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

Merge pull request #897 from ennorehling/develop 

bugfixes ships, messages
This commit is contained in:
Enno Rehling 2020-03-28 09:40:40 +01:00 committed by GitHub
parent 42280e5ff1 6ebb5c7591
commit a861b92524
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 63 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -46,5 +46,5 @@ tests/data/185.dat
/cutest/ /cutest/
/critbit/ /critbit/
*.mo *.mo
/CMakeSettings.json
/.vs /.vs
/CMakeSettings.json

56
res/core/messages.xml
View File

@ -3789,6 +3789,62 @@
<arg name="command" type="order"/> <arg name="command" type="order"/>
</type> </type>
</message> </message>
<message name="error321" section="errors">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
</type>
</message>
<message name="error322" section="errors">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
</type>
</message>
<message name="error323" section="errors">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
</type>
</message>
<message name="error324" section="errors">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
</type>
</message>
<message name="error325" section="errors">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
</type>
</message>
<message name="error326" section="errors">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
</type>
</message>
<message name="error327" section="errors">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
</type>
</message>
<message name="error328" section="errors">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
</type>
</message>
<message name="error181" section="errors"> <message name="error181" section="errors">
<type> <type>
<arg name="unit" type="unit"/> <arg name="unit" type="unit"/>

3
res/translations/messages.de.po
View File

@ -2777,6 +2777,9 @@ msgstr "\"$unit($unit) in $region($region): '$order($command)' - Das Schiff ist
msgid "error327" msgid "error327"
msgstr "\"$unit($unit) in $region($region): '$order($command)' - So viele Schiffe kann die Einheit nicht übergeben.\"" msgstr "\"$unit($unit) in $region($region): '$order($command)' - So viele Schiffe kann die Einheit nicht übergeben.\""
msgid "error328"
msgstr "\"$unit($unit) in $region($region): '$order($command)' - Dafür müssen die Schiffe an der selben Küste liegen.\""
msgid "error326" msgid "error326"
msgstr "\"$unit($unit) in $region($region): '$order($command)' - Diese Schiffe können keinen Konvoi bilden.\"" msgstr "\"$unit($unit) in $region($region): '$order($command)' - Diese Schiffe können keinen Konvoi bilden.\""

2
src/kernel/version.c
View File

@ -8,7 +8,7 @@
#ifndef ERESSEA_VERSION #ifndef ERESSEA_VERSION
/* the version number, if it was not passed to make with -D */ /* the version number, if it was not passed to make with -D */
#define ERESSEA_VERSION "3.23.0" #define ERESSEA_VERSION "3.24.0"
#endif #endif
const char *eressea_version(void) { const char *eressea_version(void) {

2
src/util/message.c
View File

@ -277,7 +277,7 @@ const message_type *mt_find(const char *name)
return data; return data;
} }
} }
return 0; return NULL;
} }
void msg_free(message * msg) void msg_free(message * msg)

1
src/util/parser.c
View File

@ -223,6 +223,7 @@ char *parse_token(const char **str, char *lbuf, size_t buflen)
} }
*cursor = '\0'; *cursor = '\0';
unicode_utf8_trim(lbuf);
*str = ctoken; *str = ctoken;
return lbuf; return lbuf;
} }