X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2FObj%2Fbriskin5.phh;h=5e22966abf2fdb9f815627f076b962b95a03e8bc;hb=e8cc9359e0330a4951224fbe1f2bc9bba02d7c7a;hp=ecc34f66b2fcfa50b410b0d053172ac878fac7e3;hpb=bba23fca78d918b22dbb183196da5e93ed5cb141;p=brisk.git

diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index ecc34f6..5e22966 100644
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -53,53 +53,6 @@ $mlang_bin5_bin5 = array(
                          'info_match'=> array( 'it' => 'Il codice della partita è <b>%d</b>.',
                                                'en' => 'Match code is <b>%d</b>.'),
 
-
-
-                         // br, hr, b, /b, win, fri
-                         'info_part' => array( 'it' => 'Ha chiamato %3$s%5$s%4$s (punti torneo %7$d), il socio era %3$s%6$s%4$s,%1$s',
-                                               'en' => 'The declarer was %3$s%5$s%4$s (tournment points %7$d), the partner was %3$s%6$s%4$s,%1$s'),
-                         // br, hr, b, /b
-                         'info_capp' => array( 'it' => 'hanno fatto %3$scappotto%4$s EBBRAVI!.%1$s',
-                                               'en' => 'and they made %3Dscapot%4$s WELL DONE!.%1$s'),
-
-                         // br, hr, b, /b, old_asta_pnt, old_pnt, winornot
-                         'info_alea' => array( 'it' => 'dovevano fare %3$salmeno %5$d%4$s punti e ne hanno fatti %3$s%6$d%4$s: hanno %7$s.%1$s',
-                                               'en' => 'they had to do %3$sat least %5$d%4$s points and they had made %3$s%6$d%4$s: they have %7$s.%1$s'),
-                         // br, hr, b, /b, old_pnt, winornot
-                         'info_more' => array( 'it' => 'dovevano fare %3$spiù di 60%4$s punti e ne hanno fatti %3$s%5$d%4$s: hanno %6$s.%1$s',
-                                               'en' => 'they had to do %3$sover 60%4$s points and they had made %3$s%5$d%4$s: they have %3$s%6$s%4$s.%1$s'),
-                         'info_win'  => array( 'it' => 'vinto',
-                                               'en' => 'win'),
-                         'info_peer' => array( 'it' => 'pareggiato',
-                                               'en' => 'drew'),
-                         'info_lost' => array( 'it' => 'perso',
-                                               'en' => 'lost'),
-
-                         // br, hr, b, /b, win_name
-                         'info_alon' => array( 'it' => '%3$s%5$s%4$s si è chiamato in mano (punti torneo %6$d),%1$s',
-                                               'en' => '%3$s%5$s%4$s play alone against each other (tournment points %6$d),%1$s'),
-                         // br, hr, b, /b, old_asta_pnt, old_pnt, winornot
-                         'info_aleaa' => array( 'it' => 'doveva fare %3$salmeno %5$d%4$s punti e ne ha fatti %3$s%6$d%4$s: ha %3$s%7$s%4$s.%1$s',
-                                               'en' => 'he/she had to do %3$sat least %5$d%4$s points and they had made %3$s%6$d%4$s: he/she had %3$s%7$s%4$s.%1$s'),
-                         // br, hr, b, /b, old_pnt, winornot
-                         'info_morea' => array( 'it' => 'doveva fare %3$spiù di 60%4$s punti e ne ha fatti %3$s%5$d%4$s: ha %3$s%6$s%4$s.%1$s',
-                                                'en' => 'he/she had to do %3$smore than 60%4$s points and they had made %3$s%5$d%4$s: he/she had %3$s%6$s%4$s.%1$s'),
-                         // br, hr, b, /b
-                         'info_acap' => array( 'it' => 'ha fatto %3$scappotto%4$s EBBRAVO!.%1$s',
-                                               'en' => 'and he/she made %3$scapot%4$s WELL DONE!.%1$s'),
-
-                         // br, hr, b, /b
-                         'info_omul' => array( 'it' => '%1$sLa partita valeva %3$s%5$s%4$s.%1$s',
-                                               'en' => '%1$sEN: The game was worth %3$s%5$s%4$s.%1$s' ),
-
-                         // br, hr, b, /b
-                         'info_alpa' => array( 'it' => '%1$sHanno passato %3$stutti%4$s.%1$s',
-                                               'en' => '%1$sEN: Hanno passato %3$stutti%4$s.%1$s' ),
-
-                         // br, hr, b, /b, aband-name
-                         'info_aban' => array( 'it' => ' Ha lasciato %3$s%5$s%4$s perché aveva al massimo %3$s2 punti%4$s.',
-                                               'en' => ' EN: Ha lasciato %3$s%5$s%4$s perché aveva al massimo %3$s2 punti%4$s.'),
-
                          'btn_bkgame'=> array( 'it' => 'torna alla partita',
                                                'en' => 'back to the game'),
                          'call_wptn' => array( 'it' => '<br>con %d punti',
@@ -130,9 +83,11 @@ function multoval($mult)
 
 function dom_select_rules()
 {
+    GLOBAL $G_lang;
+
     $ret = "<select id='select_rules'>\n";
     foreach (rules_keys() as $key) {
-        $value = rules_id2descr($key);
+        $value = rules_id2descr($key, $G_lang);
         $ret .= sprintf("<option value='%d'>%s</option>\n", $key, $value);
     }
     $ret .= "</select>\n";
@@ -309,6 +264,7 @@ class Bin5_table extends Table {
 
     function spawn(&$from)
     {
+        GLOBAL $G_lang;
         if (($thiz =& new Bin5_table()) == FALSE)
             return (FALSE);
 
@@ -650,6 +606,8 @@ class Bin5_table extends Table {
 
     function rules_change(&$bri, $user, $rules_id_s)
     {
+        GLOBAL $G_lang;
+
         //
         //  Rules: update version following loaded tcode
         //
@@ -704,7 +662,7 @@ class Bin5_table extends Table {
             if ($i < BIN5_PLAYERS_N) {
                 // FIXME_LANG
                 $msg = sprintf("<b>L'utente <i>%s</i> voleva già usare le %s.</b>",
-                               xcape($user_cur->name), xcape(rules_id2descr($user_cur->rules_get())));
+                               xcape($user_cur->name), xcape(rules_id2descr($user_cur->rules_get(), $G_lang)));
                 break;
             }
 
@@ -716,7 +674,7 @@ class Bin5_table extends Table {
             if ($rules_tot < BIN5_PLAYERS_N) {
                 // FIXME_LANG
                 $msg = sprintf("<b>L'utente <i>%s</i> vorrebbe usare le %s.</b>",
-                               xcape($user->name), xcape(rules_id2descr($rules_id)));
+                               xcape($user->name), xcape(rules_id2descr($rules_id, $G_lang)));
                 break;
             }
 
@@ -1843,7 +1801,7 @@ function show_table_info(&$bri, &$table, $table_pos)
 
     // TAG: POINTS_MANAGEMENT
     $pnt_min = $table->points_n - MAX_POINTS < 0 ? 0 : $table->points_n - MAX_POINTS;
-    $noty = sprintf('<p>%s.</p>\n', xcape(ucfirst(rules_id2descr($table->rules->id_get()))));
+    $noty = sprintf('<p>%s.</p>\n', xcape(ucfirst(rules_id2descr($table->rules->id_get(), $G_lang))));
     $noty .= sprintf('<table class=\"points\"><tr><th></th>');
 
     // Names.