From 14ad625280a22b32bb9d6035c24b868a77f630aa Mon Sep 17 00:00:00 2001 From: "Matteo Nastasi (mop)" Date: Mon, 27 Feb 2017 18:36:16 +0100 Subject: [PATCH] extract rules-related strings from variable and moved into rules_base file --- web/briskin5/Obj/briskin5.phh | 27 +++++++++------- web/briskin5/Obj/rules_base.phh | 47 ++++++++++++++++++++++++++++ web/briskin5/Obj/rules_old_rules.phh | 46 +++++++++++++-------------- 3 files changed, 85 insertions(+), 35 deletions(-) diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh index 4e5b406..91fb9c7 100644 --- a/web/briskin5/Obj/briskin5.phh +++ b/web/briskin5/Obj/briskin5.phh @@ -40,6 +40,21 @@ $mlang_bin5_bin5 = array( 'en' => '%3$slast hand%4$s'), 'info_curr' => array( 'it' => '%3$smano corrente%4$s', 'en' => '%3$scurrent hand%4$s'), + 'info_yshuf'=> array( 'it' => 'Fai tu il mazzo, ', + 'en' => 'It\'s your shuffled the cards, '), + 'info_shuf' => array( 'it' => 'Il mazzo a %s, ', + 'en' => '%s shuffled the cards, '), + 'info_yturn'=> array( 'it' => ' tocca a te giocare.', + 'en' => ' it\'s your turn.'), + 'info_turn' => array( 'it' => 'tocca a %s giocare.', + 'en' => 'it\'s the %s\'s turn.'), + 'info_mult' => array( 'it' => ' La partita vale %s.', + 'en' => ' The game worth %s.' ), + 'info_match'=> array( 'it' => 'Il codice della partita è %d.', + 'en' => 'Match code is %d.'), + + + // 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'), @@ -85,18 +100,6 @@ $mlang_bin5_bin5 = array( '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.'), - 'info_shuf' => array( 'it' => 'Il mazzo a %s, ', - 'en' => '%s shuffled the cards, '), - 'info_yturn'=> array( 'it' => ' tocca a te giocare.', - 'en' => ' it\'s your turn.'), - 'info_turn' => array( 'it' => 'tocca a %s giocare.', - 'en' => 'it\'s the %s\'s turn.'), - 'info_mult' => array( 'it' => ' La partita vale %s.', - 'en' => ' The game worth %s.' ), - 'info_yshuf'=> array( 'it' => 'Fai tu il mazzo, ', - 'en' => 'It\'s your shuffled the cards, '), - 'info_match'=> array( 'it' => 'Il codice della partita è %d.', - 'en' => 'Match code is %d.'), 'btn_bkgame'=> array( 'it' => 'torna alla partita', 'en' => 'back to the game'), 'call_wptn' => array( 'it' => '
con %d punti', diff --git a/web/briskin5/Obj/rules_base.phh b/web/briskin5/Obj/rules_base.phh index 779e3af..b102f8f 100644 --- a/web/briskin5/Obj/rules_base.phh +++ b/web/briskin5/Obj/rules_base.phh @@ -24,6 +24,53 @@ require_once("briskin5.phh"); +$mlang_bin5_rules = array( + // 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.') + ); + abstract class Rules { var $table; diff --git a/web/briskin5/Obj/rules_old_rules.phh b/web/briskin5/Obj/rules_old_rules.phh index a44cf3f..21fc253 100644 --- a/web/briskin5/Obj/rules_old_rules.phh +++ b/web/briskin5/Obj/rules_old_rules.phh @@ -270,11 +270,11 @@ class Rules_old_rules extends Rules { return (""); } else if ($act == BIN5_RULES_ALLPASS) { - return (sprintf($mlang_bin5_bin5['info_alpa'][$G_lang], + return (sprintf($mlang_bin5_rules['info_alpa'][$G_lang], $tg_br, $tg_hr, $tg_bo, $tg_bc)); } else if ($act == BIN5_RULES_ABANDON) { - return (sprintf($mlang_bin5_bin5['info_aban'][$G_lang], + return (sprintf($mlang_bin5_rules['info_aban'][$G_lang], $tg_br, $tg_hr, $tg_bo, $tg_bc, $win_name)); } @@ -286,59 +286,59 @@ class Rules_old_rules extends Rules { if ($win != $fri) { // not alone case /* MLANG: "
Nell'ultima mano ha chiamato %s, il socio era %s,
", "hanno fatto cappotto EBBRAVI!.
", "dovevano fare %s punti e ne hanno fatti %d: hanno %s.
", "
Nell'ultima mano %s si è chiamato in mano,
", "ha fatto cappotto EBBRAVO!.
", "doveva fare %s punti e ne ha fatti %d: ha %s.
", ($table->old_asta_pnt > 61 ? "almeno ".$table->old_asta_pnt : 'più di 60'), $table->old_pnt, ($wol == 1 ? "vinto" : ($wol == 0 ? "pareggiato" : "perso" */ - $noty .= sprintf($mlang_bin5_bin5['info_part'][$G_lang], + $noty .= sprintf($mlang_bin5_rules['info_part'][$G_lang], $tg_br, $tg_hr, $tg_bo, $tg_bc, $win_name, $fri_name, $old_tourn_pts); if ($old_pnt == 120) { - $noty .= sprintf($mlang_bin5_bin5['info_capp'][$G_lang], + $noty .= sprintf($mlang_bin5_rules['info_capp'][$G_lang], $tg_br, $tg_hr, $tg_bo, $tg_bc ); } else { if ($old_asta_pnt > 61) { - $noty .= sprintf($mlang_bin5_bin5['info_alea'][$G_lang], + $noty .= sprintf($mlang_bin5_rules['info_alea'][$G_lang], $tg_br, $tg_hr, $tg_bo, $tg_bc, $old_asta_pnt, $old_pnt, - ($wol == 1 ? $mlang_bin5_bin5['info_win'][$G_lang] : - ($wol == 0 ? $mlang_bin5_bin5['info_peer'][$G_lang] : - $mlang_bin5_bin5['info_lost'][$G_lang]))); + ($wol == 1 ? $mlang_bin5_rules['info_win'][$G_lang] : + ($wol == 0 ? $mlang_bin5_rules['info_peer'][$G_lang] : + $mlang_bin5_rules['info_lost'][$G_lang]))); } else { - $noty .= sprintf($mlang_bin5_bin5['info_more'][$G_lang], + $noty .= sprintf($mlang_bin5_rules['info_more'][$G_lang], $tg_br, $tg_hr, $tg_bo, $tg_bc, $old_pnt, - ($wol == 1 ? $mlang_bin5_bin5['info_win'][$G_lang] : - ($wol == 0 ? $mlang_bin5_bin5['info_peer'][$G_lang] : - $mlang_bin5_bin5['info_lost'][$G_lang]))); + ($wol == 1 ? $mlang_bin5_rules['info_win'][$G_lang] : + ($wol == 0 ? $mlang_bin5_rules['info_peer'][$G_lang] : + $mlang_bin5_rules['info_lost'][$G_lang]))); } // else of if ($old_asta_pnt > 61) { } // else of if ($old_pnt == 120) { } // if ($win != $fri) { // not alone case else { - $noty .= sprintf($mlang_bin5_bin5['info_alon'][$G_lang], + $noty .= sprintf($mlang_bin5_rules['info_alon'][$G_lang], $tg_br, $tg_hr, $tg_bo, $tg_bc, $win_name, $old_tourn_pts); if ($old_pnt == 120) { - $noty .= sprintf($mlang_bin5_bin5['info_acap'][$G_lang], + $noty .= sprintf($mlang_bin5_rules['info_acap'][$G_lang], $tg_br, $tg_hr, $tg_bo, $tg_bc); } else { if ($old_asta_pnt > 61) { - $noty .= sprintf($mlang_bin5_bin5['info_aleaa'][$G_lang], + $noty .= sprintf($mlang_bin5_rules['info_aleaa'][$G_lang], $tg_br, $tg_hr, $tg_bo, $tg_bc, $old_asta_pnt, $old_pnt, - ($wol == 1 ? $mlang_bin5_bin5['info_win'][$G_lang] : - ($wol == 0 ? $mlang_bin5_bin5['info_peer'][$G_lang] : - $mlang_bin5_bin5['info_lost'][$G_lang]))); + ($wol == 1 ? $mlang_bin5_rules['info_win'][$G_lang] : + ($wol == 0 ? $mlang_bin5_rules['info_peer'][$G_lang] : + $mlang_bin5_rules['info_lost'][$G_lang]))); } else { - $noty .= sprintf($mlang_bin5_bin5['info_morea'][$G_lang], + $noty .= sprintf($mlang_bin5_rules['info_morea'][$G_lang], $tg_br, $tg_hr, $tg_bo, $tg_bc, $old_pnt, - ($wol == 1 ? $mlang_bin5_bin5['info_win'][$G_lang] : - ($wol == 0 ? $mlang_bin5_bin5['info_peer'][$G_lang] : - $mlang_bin5_bin5['info_lost'][$G_lang]))); + ($wol == 1 ? $mlang_bin5_rules['info_win'][$G_lang] : + ($wol == 0 ? $mlang_bin5_rules['info_peer'][$G_lang] : + $mlang_bin5_rules['info_lost'][$G_lang]))); } } } @@ -346,7 +346,7 @@ class Rules_old_rules extends Rules { $old_multer = static::s_multer($old_mult, $old_asta_pnt); if ($old_multer > 1) { - $noty .= sprintf($mlang_bin5_bin5['info_omul'][$G_lang], + $noty .= sprintf($mlang_bin5_rules['info_omul'][$G_lang], $tg_br, $tg_hr, $tg_bo, $tg_bc, multoval($old_multer)); } -- 2.17.1