zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Susimail: use ngettext, fix typo (thanks m1xxy)

Browse Source
This commit is contained in:
duck
2011-03-12 21:00:04 +00:00
parent 3ecc38cc9c
commit e3a81f6091
4 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
apps/susimail/locale/messages_en.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: I2P susimail\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-03-11 20:33+0000\n"
"POT-Creation-Date: 2011-03-12 20:49+0000\n"
"PO-Revision-Date: 2010-06-15 14:09+0100\n"
"Last-Translator: duck <duck@mail.i2p>\n"
"Language-Team: duck <duck@mail.i2p>\n"
@@ -163,8 +163,10 @@ msgstr ""
#: src/src/i2p/susi/webmail/WebMail.java:1144
#, java-format
msgid "{0} messages deleted."
msgstr ""
msgid "1 message deleted."
msgid_plural "{0} messages deleted."
msgstr[0] ""
msgstr[1] ""
#: src/src/i2p/susi/webmail/WebMail.java:1264
#: src/src/i2p/susi/webmail/WebMail.java:1587
@@ -173,8 +175,10 @@ msgstr ""
#: src/src/i2p/susi/webmail/WebMail.java:1266
#, java-format
msgid "{0} Messages"
msgstr ""
msgid "1 Message"
msgid_plural "{0} Messages"
msgstr[0] ""
msgstr[1] ""
#: src/src/i2p/susi/webmail/WebMail.java:1268
msgid "Show Message"
@@ -363,8 +367,10 @@ msgstr ""
#: src/src/i2p/susi/webmail/WebMail.java:1639
#, java-format
msgid "{0} Bytes"
msgstr ""
msgid "1 Byte"
msgid_plural "{0} Bytes"
msgstr[0] ""
msgstr[1] ""
#: src/src/i2p/susi/webmail/WebMail.java:1644
msgid "Mark All"
@@ -414,7 +420,7 @@ msgid "Set"
msgstr ""
#: src/src/i2p/susi/webmail/WebMail.java:1668
msgid "Really delete this messages?"
msgid "Really delete this message?"
msgstr ""
#: src/src/i2p/susi/webmail/WebMail.java:1668

24
apps/susimail/locale/messages_nl.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: I2P susimail\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-03-11 20:33+0000\n"
"POT-Creation-Date: 2011-03-12 20:49+0000\n"
"PO-Revision-Date: 2010-06-15 14:09+0100\n"
"Last-Translator: duck <duck@mail.i2p>\n"
"Language-Team: duck <duck@mail.i2p>\n"
@@ -163,8 +163,10 @@ msgstr "Fout bij verwijderen van bericht: {0}"
#: src/src/i2p/susi/webmail/WebMail.java:1144
#, java-format
msgid "{0} messages deleted."
msgstr "{0} berichten verwijderd."
msgid "1 message deleted."
msgid_plural "{0} messages deleted."
msgstr[0] "1 bericht verwijderd."
msgstr[1] "{0} berichten verwijderd."
#: src/src/i2p/susi/webmail/WebMail.java:1264
#: src/src/i2p/susi/webmail/WebMail.java:1587
@@ -173,8 +175,10 @@ msgstr "Login"
#: src/src/i2p/susi/webmail/WebMail.java:1266
#, java-format
msgid "{0} Messages"
msgstr "{0} Berichten"
msgid "1 Message"
msgid_plural "{0} Messages"
msgstr[0] "1 Bericht"
msgstr[1] "{0} Berichten"
#: src/src/i2p/susi/webmail/WebMail.java:1268
msgid "Show Message"
@@ -363,8 +367,10 @@ msgstr "Grootte"
#: src/src/i2p/susi/webmail/WebMail.java:1639
#, java-format
msgid "{0} Bytes"
msgstr "{0} Bytes"
msgid "1 Byte"
msgid_plural "{0} Bytes"
msgstr[0] "1 Byte"
msgstr[1] "{0} Bytes"
#: src/src/i2p/susi/webmail/WebMail.java:1644
msgid "Mark All"
@@ -414,8 +420,8 @@ msgid "Set"
msgstr "Instellen"
#: src/src/i2p/susi/webmail/WebMail.java:1668
msgid "Really delete this messages?"
msgstr "Werkelijk deze berichten verwijderen?"
msgid "Really delete this message?"
msgstr "Werkelijk dit bericht verwijderen?"
#: src/src/i2p/susi/webmail/WebMail.java:1668
msgid "Yes, really delete it!"

4
apps/susimail/src/src/i2p/susi/webmail/Messages.java
View File

@@ -31,4 +31,8 @@ public class Messages {
public static String getString(String s, Object o, Object o2) {
return Translate.getString(s, o, o2, I2PAppContext.getGlobalContext(), BUNDLE_NAME);
}
public static String getString(int n, String s, String p) {
return Translate.getString(n, s, p, I2PAppContext.getGlobalContext(), BUNDLE_NAME);
}
}

11
apps/susimail/src/src/i2p/susi/webmail/WebMail.java
View File

@@ -1141,7 +1141,7 @@ public class WebMail extends HttpServlet
sessionObject.mailbox.performDelete();
sessionObject.folder.setElements( sessionObject.mailbox.getUIDLs() );
sessionObject.pageChanged = true;
sessionObject.info += _("{0} messages deleted.", numberDeleted);
sessionObject.info += ngettext("1 message deleted.", "{0} messages deleted.", numberDeleted);
}
sessionObject.reallyDelete = false;
}
@@ -1263,7 +1263,7 @@ public class WebMail extends HttpServlet
if( sessionObject.state == STATE_AUTH )
subtitle = _("Login");
else if( sessionObject.state == STATE_LIST )
subtitle = _("{0} Messages", sessionObject.mailbox.getNumMails());
subtitle = ngettext("1 Message", "{0} Messages", sessionObject.mailbox.getNumMails());
else if( sessionObject.state == STATE_SHOW )
subtitle = _("Show Message");
@@ -1636,7 +1636,7 @@ public class WebMail extends HttpServlet
", invert=" + sessionObject.invert +
", clear=" + sessionObject.clear );
out.println( "<tr class=\"list" + bg + "\"><td><input type=\"checkbox\" class=\"optbox\" name=\"check" + i + "\" value=\"1\"" +
( idChecked ? "checked" : "" ) + ">" + ( RELEASE ? "" : "" + i ) + "</td><td>" + link + mail.shortSender + "</a></td><td>&nbsp;</td><td>" + link + mail.shortSubject + "</a></td><td>&nbsp;</td><td>" + mail.formattedDate + "</a></td><td>&nbsp;</td><td>" + _("{0} Bytes", mail.size) + "</a></td></tr>" );
( idChecked ? "checked" : "" ) + ">" + ( RELEASE ? "" : "" + i ) + "</td><td>" + link + mail.shortSender + "</a></td><td>&nbsp;</td><td>" + link + mail.shortSubject + "</a></td><td>&nbsp;</td><td>" + mail.formattedDate + "</a></td><td>&nbsp;</td><td>" + ngettext("1 Byte", "{0} Bytes", mail.size) + "</a></td></tr>" );
bg = 1 - bg;
i++;
}
@@ -1721,4 +1721,9 @@ public class WebMail extends HttpServlet
private static String _(String s, Object o, Object o2) {
return Messages.getString(s, o, o2);
}
/** translate */
private String ngettext(String s, String p, int n) {
return Messages.getString(n, s, p);
}
}