From e930c23ac2a2571ed9cc2a42334321ce150a6dbf Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Fri, 29 Mar 2013 22:45:09 -0700 Subject: [PATCH] TRANSLATION: marked more strings for translation --- TRANSLATION | 2 +- include/game.php | 48 +++++++++++++++++++++++++++--------------------- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/TRANSLATION b/TRANSLATION index e5c7639..ef8b2c4 100644 --- a/TRANSLATION +++ b/TRANSLATION @@ -2,7 +2,7 @@ Translation: to update the pot file run: -xgettext -L PHP -n --package-name=edoko --msgid-bugs-address=arun@nubati.net *php */*php +xgettext --add-comment=/ -L PHP -n --package-name=edoko --msgid-bugs-address=arun@nubati.net *php */*php mv messages.po po/messages.pot To start a new translation use something like (here shown to create de.po): diff --git a/include/game.php b/include/game.php index 72e7db1..38cf7e3 100644 --- a/include/game.php +++ b/include/game.php @@ -27,7 +27,7 @@ if(!isset($HOST)) /* calling game.php only makes sense when we give it a hash for a game */ if(!myisset('me')) { - echo "Hmm, you really shouldn't mess with the urls.
\n"; + echo _("Hmm, you really shouldn't mess with the urls.")."
\n"; return; } $me = $_REQUEST['me']; @@ -36,8 +36,8 @@ $me = $_REQUEST['me']; $myid = DB_get_userid('hash',$me); if(!$myid) { - echo "Can't find you in the database, please check the url.
\n"; - echo "perhaps the game has been canceled, check by login in here."; + echo _('Cannot find you in the database, please check the url.')."
\n"; + printf(_('Perhaps the game has been canceled, check by login in here.'),$INDEX); return; } @@ -215,9 +215,8 @@ else if( $mystatus == 'gameover' && isset($_SESSION['id']) ) } else { - echo "
\n"; - echo "It's your turn in these games: \n"; - echo "Please log in to see this information.\n"; + echo '
'."\n"; + printf( _("It's your turn in these games:\nPlease log in to see this information.\n") ); echo "
\n\n"; } @@ -226,7 +225,7 @@ else *****************************************************************/ if($session) { - echo "
\n"; + echo '
'."\n"; /* output rule set */ echo "
\n "._('Rules').":\n"; @@ -710,7 +709,7 @@ switch($mystatus) /* update game status */ cancel_game('lowtrump',$gameid); - $messages[] = sprintf(('The game has been canceled because %s'. + $messages[] = sprintf(_('The game has been canceled because %s'. ' has low trump and nobody is playing solo.'),DB_get_name('userid',$cancel)); }; @@ -1009,12 +1008,15 @@ switch($mystatus) if($card<27) $nrtrump++; $low=''; if($usersick=='lowtrump') - $low='low'; - echo "Player $name has $nrtrump $low trump. Do you want to take them?". - "Yes
\n"; + $low=_('low'); + /// TRANSLATORS: first %s=name, %d=number of trump, second %s= '' or 'low' for trumpfarmut + printf(_('Player %s has %d %s trump. Do you want to take them?'. + 'Yes')."
\n", + $name,$nrtrump,$low,"index.php?action=game&me=$me&trump=$user"); } } - echo "No way
\n"; + /// TRANSLATORS: answer to question about taking trump in poverty game + echo ""._("No way")."
\n"; echo "
\n"; } break; @@ -2012,23 +2014,25 @@ switch($mystatus) ' LEFT JOIN Card ON Card.id=Hand_Card.card_id'. " WHERE Hand.game_id=".DB_quote_smart($gameid). ' GROUP BY Hand.party' ); - echo "
\n Totals:
\n"; + echo "
\n "._("Totals:")."
\n"; while( $r = DB_fetch_array($result)) echo ' '.$r[0].' '.$r[1]."
\n"; $queryresult = DB_query('SELECT timediff(mod_date,create_date) '. " FROM Game WHERE id=".DB_quote_smart($gameid)); $r = DB_fetch_array($queryresult); - echo '

This game took '.$r[0]." hours.

\n"; + echo '

'; + printf(_('This game took %d hours.'), $r[0]); + echo "

\n"; - echo "
\n Points Re:
\n"; + echo "
\n "._("Points Re:")."
\n"; $queryresult = DB_query('SELECT score FROM Score '. " WHERE game_id=".DB_quote_smart($gameid)." AND party='re'"); while($r = DB_fetch_array($queryresult) ) echo ' '.$r[0]."
\n"; echo "
\n"; - echo "
\n Points Contra:
\n"; + echo "
\n "._("Points Contra:")."
\n"; $queryresult = DB_query('SELECT score FROM Score '. " WHERE game_id=".DB_quote_smart($gameid)." AND party='contra'"); while($r = DB_fetch_array($queryresult) ) @@ -2170,10 +2174,11 @@ switch ($card_status) { $type='exchange'; foreach($mycards as $card) display_link_card($card,$PREF['cardset'],$type); - echo ' '."\n"; + echo ' '."\n"; break; case CARDS_MYTURN: - echo 'Hello '.$myname.", it's your turn!
\n"; + printf (_("Hello %s, it's your turn!"),$myname); + echo "
\n"; echo _('Your cards are').":
\n"; /* do we have to follow suite? */ @@ -2243,7 +2248,8 @@ switch ($card_status) { else { $name = DB_get_name('userid',$myid); - echo "$name's were:
\n"; + printf (_("%s's were:"),$name); + echo "
\n"; } $oldcards = DB_get_all_hand($me); $oldcards = mysort($oldcards,$gametype); @@ -2264,7 +2270,7 @@ switch ($card_status) { $name = DB_get_name('userid',$user); $oldcards = DB_get_all_hand($userhash); $oldcards = mysort($oldcards,$gametype); - echo sprintf(_("%s's cards were:"),$name); + printf(_("%s's cards were:"),$name); echo "
\n"; foreach($oldcards as $card) display_card($card,$PREF['cardset']); @@ -2341,7 +2347,7 @@ $other_game_ids = DB_played_by_others($gameid); if(sizeof($other_game_ids)>0 && $mystatus=='gameover') { $mypos = DB_get_pos_by_hash($me); - echo "

See how other played the same hand: \n"; + echo '

'._('See how other played the same hand:')." \n"; foreach($other_game_ids as $id) { $otherhash = DB_get_hash_from_game_and_pos($id,$mypos); -- 2.17.1