Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #229 from Arkshine/feature/trans-format-and-native

Browse Source 
Add %l format specifier and SetTranslationTarget() native (bug 6331)
This commit is contained in:
Vincent Herbet 2015-03-26 22:54:11 +01:00
commit a59b72f96a
3 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
amxmodx/amxmodx.cpp
View File

@ -4418,6 +4418,14 @@ static cell AMX_NATIVE_CALL LookupLangKey(AMX *amx, cell *params)
return 1; return 1;
}; };
// SetGlobalTransTarget(client)
static cell AMX_NATIVE_CALL SetGlobalTransTarget(AMX *amx, cell *params)
{
g_langMngr.SetDefLang(params[1]);
return 1;
};
// has_map_ent_class(const classname[]) // has_map_ent_class(const classname[])
static cell AMX_NATIVE_CALL has_map_ent_class(AMX *amx, cell *params) static cell AMX_NATIVE_CALL has_map_ent_class(AMX *amx, cell *params)
{ {
@ -4615,6 +4623,7 @@ AMX_NATIVE_INFO amxmodx_Natives[] =
{"GetLangTransKey", GetLangTransKey}, {"GetLangTransKey", GetLangTransKey},
{"LibraryExists", LibraryExists}, {"LibraryExists", LibraryExists},
{"LookupLangKey", LookupLangKey}, {"LookupLangKey", LookupLangKey},
{"SetGlobalTransTarget", SetGlobalTransTarget},
{"PrepareArray", PrepareArray}, {"PrepareArray", PrepareArray},
{"ShowSyncHudMsg", ShowSyncHudMsg}, {"ShowSyncHudMsg", ShowSyncHudMsg},
{"is_rukia_a_hag", is_rukia_a_hag}, {"is_rukia_a_hag", is_rukia_a_hag},

18
amxmodx/format.cpp
View File

@ -650,16 +650,26 @@ reswitch:
arg++; arg++;
break; break;
case 'L': case 'L':
case 'l':
{ {
CHECK_ARGS(1); cell target;
cell addr = params[arg++]; if (ch == 'L')
{
CHECK_ARGS(1);
target = params[arg++];
}
else
{
CHECK_ARGS(0);
target = g_langMngr.GetDefLang();
}
int len; int len;
const char *key = get_amxstring(amx, params[arg++], 3, len); const char *key = get_amxstring(amx, params[arg++], 3, len);
const char *def = translate(amx, addr, key); const char *def = translate(amx, target, key);
if (!def) if (!def)
{ {
static char buf[255]; static char buf[255];
UTIL_Format(buf, sizeof(buf)-1, "ML_NOTFOUND: %s", key); UTIL_Format(buf, sizeof(buf) - 1, "ML_NOTFOUND: %s", key);
def = buf; def = buf;
} }
size_t written = atcprintf(buf_p, llen, def, amx, params, &arg); size_t written = atcprintf(buf_p, llen, def, amx, params, &arg);

13
plugins/include/lang.inc
View File

@ -60,3 +60,16 @@ native AddTranslation(const lang[3], TransKey:key, const phrase[]);
* or LANG_SERVER * or LANG_SERVER
*/ */
native LookupLangKey(Output[], OutputSize, const Key[], &id); native LookupLangKey(Output[], OutputSize, const Key[], &id);
/**
* Sets the global language target.
*
* @note This is useful for creating functions
* that will be compatible with the %l format specifier. Note that invalid
* indexes can be specified but the error will occur during translation,
* not during this function call.
*
* @param client Client index or LANG_SERVER
* @noreturn
*/
native SetGlobalTransTarget(client);