edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 14:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2032 from heinrich5991/pr_positional

Browse source 
Allow translations to reorder string substitutions
This commit is contained in:
oy 2019-02-10 18:19:56 +01:00 committed by GitHub
parent e76cc8cb6a ddd2b93190
commit 508f56f25f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/base/system.c
View file

@ -100,7 +100,7 @@ void dbg_msg(const char *sys, const char *fmt, ...)
va_start(args, fmt);
#if defined(CONF_FAMILY_WINDOWS)
_vsnprintf(msg, sizeof(str)-len, fmt, args);
_vsprintf_p(msg, sizeof(str)-len, fmt, args);
#else
vsnprintf(msg, sizeof(str)-len, fmt, args);
#endif
@ -1472,7 +1472,7 @@ int fs_storage_path(const char *appname, char *path, int max)
char *home = getenv("APPDATA");
if(!home)
return -1;
_snprintf(path, max, "%s/%s", home, appname);
str_format(path, max, "%s/%s", home, appname);
return 0;
#else
char *home = getenv("HOME");
@ -1484,25 +1484,25 @@ int fs_storage_path(const char *appname, char *path, int max)
return -1;
#if defined(CONF_PLATFORM_MACOSX)
snprintf(path, max, "%s/Library/Application Support/%s", home, appname);
str_format(path, max, "%s/Library/Application Support/%s", home, appname);
return 0;
#endif
/* old folder location */
snprintf(path, max, "%s/.%s", home, appname);
str_format(path, max, "%s/.%s", home, appname);
for(i = strlen(home)+2; path[i]; i++)
path[i] = tolower(path[i]);
if(!xdgdatahome)
{
/* use default location */
snprintf(xdgpath, max, "%s/.local/share/%s", home, appname);
str_format(xdgpath, max, "%s/.local/share/%s", home, appname);
for(i = strlen(home)+14; xdgpath[i]; i++)
xdgpath[i] = tolower(xdgpath[i]);
}
else
{
snprintf(xdgpath, max, "%s/%s", xdgdatahome, appname);
str_format(xdgpath, max, "%s/%s", xdgdatahome, appname);
for(i = strlen(xdgdatahome)+1; xdgpath[i]; i++)
xdgpath[i] = tolower(xdgpath[i]);
}
@ -1515,7 +1515,7 @@ int fs_storage_path(const char *appname, char *path, int max)
return 0;
}
snprintf(path, max, "%s", xdgpath);
str_format(path, max, "%s", xdgpath);
return 0;
#endif
@ -1774,7 +1774,7 @@ void str_format(char *buffer, int buffer_size, const char *format, ...)
#if defined(CONF_FAMILY_WINDOWS)
va_list ap;
va_start(ap, format);
_vsnprintf(buffer, buffer_size, format, ap);
_vsprintf_p(buffer, buffer_size, format, ap);
va_end(ap);
#else
va_list ap;

21
src/test/str.cpp
View file

@ -40,3 +40,24 @@ TEST(Str, Endswith)
EXPECT_EQ(str_endswith(ABCDEFG, DEFG) - ABCDEFG,
str_length(ABCDEFG) - str_length(DEFG));
}
TEST(StrFormat, Positional)
{
char aBuf[256];
// normal
str_format(aBuf, sizeof(aBuf), "%s %s", "first", "second");
EXPECT_STREQ(aBuf, "first second");
// normal with positional arguments
str_format(aBuf, sizeof(aBuf), "%1$s %2$s", "first", "second");
EXPECT_STREQ(aBuf, "first second");
// reverse
str_format(aBuf, sizeof(aBuf), "%2$s %1$s", "first", "second");
EXPECT_STREQ(aBuf, "second first");
// duplicate
str_format(aBuf, sizeof(aBuf), "%1$s %1$s %2$d %1$s %2$d", "str", 1);
EXPECT_STREQ(aBuf, "str str 1 str 1");
}