TRANSLATION: marked more strings for translation

diff --git a/TRANSLATION b/TRANSLATION
index 7be17a215549e3a41d742eaed24fea2174409921..e5c76392ea01335beaba3817fcbd6f984596ae18 100644 (file)
--- a/TRANSLATION
+++ b/TRANSLATION
@@ -5,7 +5,6 @@ to update the pot file run:
 xgettext -L PHP -n --package-name=edoko --msgid-bugs-address=arun@nubati.net *php */*php
 mv messages.po po/messages.pot
 
 xgettext -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):
 
 cd po
 To start a new translation use something like (here shown to create de.po):
 
 cd po


@@ -20,4 +19,4 @@ Start editing and then after updating a po run:
 
 msgconv -t utf-8 de.po > de.po.new && mv de.po.new de.po
 msgfmt -cv -o de.mo de.po
 
 msgconv -t utf-8 de.po > de.po.new && mv de.po.new de.po
 msgfmt -cv -o de.mo de.po

-mv de.mo ../locale/de/LC_MESSAGES/edoko.mo
\ No newline at end of file
+mv de.mo ../locale/de/LC_MESSAGES/edoko.mo

diff --git a/include/user.php b/include/user.php
index 55b84f4e5e3379b4f4debab91ef6330c9bf0bea9..d85dac50179d39d1e9e7af9fc6a40fcef36edf6b 100644 (file)
--- a/include/user.php
+++ b/include/user.php
@@ -54,10 +54,10 @@ if(myisset('forgot'))
          {
            echo _('Ok, I will send you a new password.').' <br />';
            if($number >1)
          {
            echo _('Ok, I will send you a new password.').' <br />';
            if($number >1)

-             echo "N.B. You tried this already $number times during the last day and it will only work ".
-               " 5 times during a day.<br />";
+             echo sprintf(_("N.B. You tried this already %s times during the last day and it will only work".
+                            " 5 times during a day."),$number)."<br />\n";

            echo _('The new password will be valid for one day, make sure you reset it to something else.').'<br />';
            echo _('The new password will be valid for one day, make sure you reset it to something else.').'<br />';

-           echo "Back to the  <a href=\"$INDEX\">main page</a>.";
+           echo sprintf(_('Back to the <a href="%s">main page</a>.'),$INDEX);

 
            /* create temporary password, use the fist 8 letters of a md5 hash */
            $TIME  = (string) time(); /* to avoid collisions */
 
            /* create temporary password, use the fist 8 letters of a md5 hash */
            $TIME  = (string) time(); /* to avoid collisions */


@@ -81,7 +81,7 @@ if(myisset('forgot'))
             * and spam a user this way */
            echo _('Sorry you already tried 5 times during the last 24h.<br />'.
                   'You need to use one of those passwords or wait to get a new one.').'<br />';
             * and spam a user this way */
            echo _('Sorry you already tried 5 times during the last 24h.<br />'.
                   'You need to use one of those passwords or wait to get a new one.').'<br />';

-           echo "Back to the <a href=\"$INDEX\">main page</a>.";
+           echo sprintf(_('Back to the <a href="%s">main page</a>.'),$INDEX);

          }
       }
     else
          }
       }
     else


@@ -89,12 +89,12 @@ if(myisset('forgot'))
 
        /* no email given? */
        if($email=="")
 
        /* no email given? */
        if($email=="")

-         echo "You need to give me an email address! <br />".
-           "Please try <a href=\"$INDEX\">again</a>.";
+         echo _('You need to give me an email address!')." <br />".
+           sprintf(_('Please try <a href="%s">again</a>.'),$INDEX);

        else /* default error message */
        else /* default error message */

-         echo "Couldn't find a player with this email! <br />".
-           "Please contact $ADMIN_NAME, if you think this is a mistake <br />".
-           "or else try <a href=\"$INDEX\">again</a>.";
+         echo _("Couldn't find a player with this email!")."<br />".
+           sprintf(_('Please contact %s, if you think this is a mistake '.
+                     'or else try <a href="%s">again</a>.'),$ADMIN_NAME, $INDEX );

       }
   }
 else
       }
   }
 else


@@ -134,8 +134,8 @@ else
            $vac_start   = $myvacation[0];
            $vac_stop    = $myvacation[1];
            $vac_comment = $myvacation[2];
            $vac_start   = $myvacation[0];
            $vac_stop    = $myvacation[1];
            $vac_comment = $myvacation[2];

-           echo '<p class="vacation">'._("Enjoy your vacation (don't forgot to change your settings once you're back).").
-             " Between $vac_start and $vac_stop other users will see the following message: $vac_comment.</p>\n";
+           echo '<p class="vacation">'._("Enjoy your vacation (don't forgot to change your settings once you're back).")." ".
+             _("Between $vac_start and $vac_stop other users will see the following message: $vac_comment.")."</p>\n";

          }
 
        echo '<h4>'._('These are your games').":</h4>\n";
          }
 
        echo '<h4>'._('These are your games').":</h4>\n";


@@ -236,11 +236,12 @@ else
                                if($vacation=check_vacation($userid))
                                  {
                                    $stop = substr($vacation[1],0,10);
                                if($vacation=check_vacation($userid))
                                  {
                                    $stop = substr($vacation[1],0,10);

-                                   $title = 'begin:'.substr($vacation[0],0,10).' end:'.$vacation[1].' '.$vacation[2];
-                                   $output_active .= " <span class=\"vacation\" title=\"$title\">$name's (on vacation until $stop)</span> turn\n";
+                                   $title = _('begin:').substr($vacation[0],0,10).' '._('end:').$vacation[1].' '.$vacation[2];
+                                   $output_active .= " <span class=\"vacation\" title=\"$title\">".
+                                     sprintf(_("%s's turn"),$name).' '._("(on vacation until $stop)")."</span>\n";

                                  }
                                else
                                  }
                                else

-                                 $output_active .= "$name's turn\n";
+                                 $output_active .= sprintf(_("%s's turn"),$name)."\n";

 
                                /* check if we need to send out a reminder */
                                if(DB_get_reminder($userid,$gameid)==0)
 
                                /* check if we need to send out a reminder */
                                if(DB_get_reminder($userid,$gameid)==0)


@@ -251,7 +252,7 @@ else
                            $output_active .= '</span>';
 
                            if(time()-strtotime($gamemoddate) > 60*60*24*30)
                            $output_active .= '</span>';
 
                            if(time()-strtotime($gamemoddate) > 60*60*24*30)

-                             $output_active .= "<a href=\"$INDEX?action=cancel&amp;me=".$myhash."\">Cancel?</a> ";
+                             $output_active .= "<a href=\"$INDEX?action=cancel&amp;me=".$myhash."\">"._('Cancel?').'</a> ';

                          }
 
                        if($maxgame>1)
                          }
 
                        if($maxgame>1)


@@ -320,7 +321,9 @@ else
        $emails = DB_get_emails_of_last_logins(7);
        for($i=0;$i<7;$i++)
          {
        $emails = DB_get_emails_of_last_logins(7);
        for($i=0;$i<7;$i++)
          {

-           echo "<img class=\"gravatar\" title=\"".$names[$i]."\" src=\"http://www.gravatar.com/avatar/".md5(strtolower(trim($emails[$i])))."?d=identicon\" />\n";
+           echo '<img class="gravatar" title="'.$names[$i].
+             '" src="http://www.gravatar.com/avatar/'.
+             md5(strtolower(trim($emails[$i])))."?d=identicon\" />\n";

          }
        echo "</p>\n";
 
          }
        echo "</p>\n";
 


@@ -328,7 +331,9 @@ else
       }
     else
       {
       }
     else
       {

-       echo '<div class="message">'."Sorry email and password don't match. Please <a href=\"$INDEX\">try again</a>.".' </div>';
+       echo '<div class="message">'."\n";
+       echo  sprintf(_("Sorry email and password don't match. Please <a href=\"%s\">try again</a>."),$INDEX);
+       echo '</div>'."\n";

       }
   };
 ?>
\ No newline at end of file
       }
   };
 ?>
\ No newline at end of file

diff --git a/po/messages.pot b/po/messages.pot
index e84a8d1f0447bc33f3cdc331ae9c49c37407d022..597af06728677e26f40a30e197d20c51de53c070 100644 (file)
--- a/po/messages.pot
+++ b/po/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edoko\n"
 "Report-Msgid-Bugs-To: arun@nubati.net\n"
 msgstr ""
 "Project-Id-Version: edoko\n"
 "Report-Msgid-Bugs-To: arun@nubati.net\n"

-"POT-Creation-Date: 2013-01-12 17:10-0800\n"
+"POT-Creation-Date: 2013-01-13 15:32-0800\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -652,7 +652,7 @@ msgid "Trump back"
 msgstr ""
 
 #: include/preferences.php:344
 msgstr ""
 
 #: include/preferences.php:344

-msgid "Your settings are"
+msgid "Your settings"

 msgstr ""
 
 #: include/preferences.php:346
 msgstr ""
 
 #: include/preferences.php:346


@@ -887,12 +887,24 @@ msgstr ""
 msgid "Ok, I will send you a new password."
 msgstr ""
 
 msgid "Ok, I will send you a new password."
 msgstr ""
 

+#: include/user.php:57
+#, php-format
+msgid ""
+"N.B. You tried this already %s times during the last day and it will only "
+"work 5 times during a day."
+msgstr ""
+

 #: include/user.php:59
 msgid ""
 "The new password will be valid for one day, make sure you reset it to "
 "something else."
 msgstr ""
 
 #: include/user.php:59
 msgid ""
 "The new password will be valid for one day, make sure you reset it to "
 "something else."
 msgstr ""
 

+#: include/user.php:60 include/user.php:84
+#, php-format
+msgid "Back to the <a href=\"%s\">main page</a>."
+msgstr ""
+

 #: include/user.php:67
 #, php-format
 msgid ""
 #: include/user.php:67
 #, php-format
 msgid ""


@@ -910,6 +922,26 @@ msgid ""
 "one of those passwords or wait to get a new one."
 msgstr ""
 
 "one of those passwords or wait to get a new one."
 msgstr ""
 

+#: include/user.php:92
+msgid "You need to give me an email address!"
+msgstr ""
+
+#: include/user.php:93
+#, php-format
+msgid "Please try <a href=\"%s\">again</a>."
+msgstr ""
+
+#: include/user.php:95
+msgid "Couldn't find a player with this email!"
+msgstr ""
+
+#: include/user.php:96
+#, php-format
+msgid ""
+"Please contact %s, if you think this is a mistake or else try <a href=\"%s"
+"\">again</a>."
+msgstr ""
+

 #: include/user.php:137
 msgid ""
 "Enjoy your vacation (don't forgot to change your settings once you're back)."
 #: include/user.php:137
 msgid ""
 "Enjoy your vacation (don't forgot to change your settings once you're back)."


@@ -939,42 +971,65 @@ msgstr ""
 msgid "your turn"
 msgstr ""
 
 msgid "your turn"
 msgstr ""
 

-#: include/user.php:248
+#: include/user.php:239
+msgid "begin:"
+msgstr ""
+
+#: include/user.php:239
+msgid "end:"
+msgstr ""
+
+#: include/user.php:241 include/user.php:244
+#, php-format
+msgid "%s's turn"
+msgstr ""
+
+#: include/user.php:249

 msgid "Send a reminder?"
 msgstr ""
 
 msgid "Send a reminder?"
 msgstr ""
 

-#: include/user.php:259
-msgid "show old"
+#: include/user.php:255
+msgid "Cancel?"

 msgstr ""
 
 #: include/user.php:260
 msgstr ""
 
 #: include/user.php:260

+msgid "show old"
+msgstr ""
+
+#: include/user.php:261

 msgid "hide old"
 msgstr ""
 
 msgid "hide old"
 msgstr ""
 

-#: include/user.php:301
+#: include/user.php:302

 msgid "show all"
 msgstr ""
 
 msgid "show all"
 msgstr ""
 

-#: include/user.php:301
+#: include/user.php:302

 msgid "hide all"
 msgstr ""
 
 msgid "hide all"
 msgstr ""
 

-#: include/user.php:303
+#: include/user.php:304

 msgid "show inactive"
 msgstr ""
 
 msgid "show inactive"
 msgstr ""
 

-#: include/user.php:303
+#: include/user.php:304

 msgid "hide inactive"
 msgstr ""
 
 msgid "hide inactive"
 msgstr ""
 

-#: include/user.php:308
+#: include/user.php:309

 msgid "You can start new games using the link in the top right corner!"
 msgstr ""
 
 msgid "You can start new games using the link in the top right corner!"
 msgstr ""
 

-#: include/user.php:312
+#: include/user.php:313

 msgid "New Players"
 msgstr ""
 
 msgid "New Players"
 msgstr ""
 

-#: include/user.php:317
+#: include/user.php:318

 msgid "Players last logged in"
 msgstr ""
 msgid "Players last logged in"
 msgstr ""

+
+#: include/user.php:335
+#, php-format
+msgid ""
+"Sorry email and password don't match. Please <a href=\"%s\">try again</a>."
+msgstr ""