Misc

* added option to 'verbose' concatenate a list of items to class Lang
 * added option to strip tags from a string to class Markdown
 * fixed several instances of wrong categories on pages
 * actually display world state conditions for zone music
 * some typos all over the place

localization/lang.class.php

@@ -90,6 +90,29 @@ class Lang
         return self::vspf($var, $vspfArgs);
     }
 
+    public static function concat($args, $useAnd = true, $callback = null)
+    {
+        $b = '';
+        $i = 0;
+        $n = count($args);
+        foreach ($args as $k => $arg)
+        {
+            if (is_callable($callback))
+                $b .= $callback($arg, $k);
+            else
+                $b .= $arg;
+
+            if ($n > 1 && $i < ($n - 2))
+                $b .= ', ';
+            else if ($n > 1 && $i == $n - 2)
+                $b .= Lang::main($useAnd ? 'and' : 'or');
+
+            $i++;
+        }
+
+        return $b;
+    }
+
     public static function sort($prop, $group, $method = SORT_NATURAL)
     {
 

localization/locale_dede.php

@@ -721,7 +721,8 @@ $lang = array(
     'pet'      => array(
         'notFound'      => "Diese Tierart existiert nicht.",
         'exotic'        => "Exotisch",
-        'cat'           => ["Wildheit", "Hartnäckigkeit", "Gerissenheit"]
+        'cat'           => ["Wildheit", "Hartnäckigkeit", "Gerissenheit"],
+        'food'          => ["Fleisch", "Fisch", "Käse", "Brot", "Fungus", "Obst", "Rohes Fleisch", "Roher Fisch"]
     ),
     'faction' => array(
         'notFound'      => "Diese Fraktion existiert nicht.",

localization/locale_enus.php

@@ -721,7 +721,8 @@ $lang = array(
     'pet'      => array(
         'notFound'      => "This pet family doesn't exist.",
         'exotic'        => "Exotic",
-        'cat'           => ["Ferocity", "Tenacity", "Cunning"]
+        'cat'           => ["Ferocity", "Tenacity", "Cunning"],
+        'food'          => ["Meat", "Fish", "Cheese", "Bread", "Fungus", "Fruit", "Raw Meat", "Raw Fish"] // ItemPetFood.dbc
     ),
     'faction' => array(
         'notFound'      => "This faction doesn't exist.",

localization/locale_eses.php

@@ -721,7 +721,8 @@ $lang = array(
     'pet'      => array(
         'notFound'      => "Esta familia de mascotas no existe.",
         'exotic'        => "Exótica",
-        'cat'           => ["Ferocidad", "Tenacidad", "Astucia"]
+        'cat'           => ["Ferocidad", "Tenacidad", "Astucia"],
+        'food'          => ["Carne", "Pescado", "Queso", "Pan", "Hongo", "Fruta", "Carne cruda", "Pescado crudo"]
     ),
     'faction' => array(
         'notFound'      => "Esta facción no existe.",

localization/locale_frfr.php

@@ -721,7 +721,8 @@ $lang = array(
     'pet'      => array(
         'notFound'      => "Cette famille de familiers n'existe pas.",
         'exotic'        => "Exotique",
-        'cat'           => ["Férocité", "Tenacité", "Ruse"]
+        'cat'           => ["Férocité", "Tenacité", "Ruse"],
+        'food'          => ["Viande", "Poisson", "Fromage", "Pain", "Champignon", "Fruit", "Viande crue", "Poisson cru"]
     ),
     'faction' => array(
         'notFound'      => "Cette faction n'existe pas.",

localization/locale_ruru.php

@@ -721,7 +721,8 @@ $lang = array(
     'pet'      => array(
         'notFound'      => "Такой породы питомцев не существует.",
         'exotic'        => "Экзотический",
-        'cat'           => ["Свирепость", "Упорство", "Хитрость"]
+        'cat'           => ["Свирепость", "Упорство", "Хитрость"],
+        'food'          => ["Мясо", "Рыба", "Сыр", "Хлеб", "Грибы", "Фрукты", "Сырое мясо", "Сырая рыба"]
     ),
     'faction' => array(
         'notFound'      => "Такая фракция не существует.",