Enable compile time specification of data and locale directories and prefs file

[neverball] / share / i18n.c

diff --git a/share/i18n.c b/share/i18n.c
index bca6aae..7d6fd92 100644 (file)
--- a/share/i18n.c
+++ b/share/i18n.c
@@ -30,26 +30,26 @@ const char *sgettext(const char *msgid)
 
     if (msgval == msgid)
     {
-        msgval = strrchr(msgid, '^');
-        if (msgval == NULL)
-            msgval = msgid;
-        else
+        if ((msgval = strrchr(msgid, '^')))
             msgval++;
+        else
+            msgval = msgid;
     }
     return msgval;
 }
 
 /*---------------------------------------------------------------------------*/
 
-#define LANG_NUMBER 4
+#define LANG_NUMBER 5
 
 const char *language_names[] = {
     N_("English"),
     N_("French"),
     N_("German"),
-    N_("Latvian")
+    N_("Latvian"),
+    N_("Spanish"),
 };
-const char *language_codes[] = {"en", "fr", "de", "lv"};
+const char *language_codes[] = {"en", "fr", "de", "lv", "es"};
 
 /*---------------------------------------------------------------------------*/
 
@@ -106,9 +106,6 @@ const char *language_get_name(int id)
 
 const char *language_get_code(int id)
 {
-        if (id > 0)
-                return language_codes[id - 1];
-        else
-                return "";
+    return id > 0 ? language_codes[id - 1] : "";
 }