Changeset 0a76a0d
- Timestamp:
- Dec 2, 2011 5:05:08 PM (9 years ago)
- Branches:
- master
- Children:
- c9cccd7
- Parents:
- 080cc96
- Location:
- apps/susimail
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
apps/susimail/locale/messages_ar.po
r080cc96 r0a76a0d 290 290 291 291 #: src/src/i2p/susi/webmail/WebMail.java:1583 292 msgid "Pass "292 msgid "Password" 293 293 msgstr "كلمة السر" 294 294 -
apps/susimail/locale/messages_de.po
r080cc96 r0a76a0d 295 295 296 296 #: src/src/i2p/susi/webmail/WebMail.java:1590 297 msgid "Pass "297 msgid "Password" 298 298 msgstr "Passwort" 299 299 -
apps/susimail/locale/messages_en.po
r080cc96 r0a76a0d 290 290 291 291 #: src/src/i2p/susi/webmail/WebMail.java:1590 292 msgid "Pass "292 msgid "Password" 293 293 msgstr "" 294 294 -
apps/susimail/locale/messages_es.po
r080cc96 r0a76a0d 300 300 301 301 #: src/src/i2p/susi/webmail/WebMail.java:1590 302 msgid "Pass "302 msgid "Password" 303 303 msgstr "Contraseña" 304 304 -
apps/susimail/locale/messages_fr.po
r080cc96 r0a76a0d 290 290 291 291 #: src/src/i2p/susi/webmail/WebMail.java:1583 292 msgid "Pass "292 msgid "Password" 293 293 msgstr "Mot de passe" 294 294 -
apps/susimail/locale/messages_it.po
r080cc96 r0a76a0d 292 292 293 293 #: src/src/i2p/susi/webmail/WebMail.java:1590 294 msgid "Pass "294 msgid "Password" 295 295 msgstr "Password" 296 296 -
apps/susimail/locale/messages_nl.po
r080cc96 r0a76a0d 290 290 291 291 #: src/src/i2p/susi/webmail/WebMail.java:1583 292 msgid "Pass "292 msgid "Password" 293 293 msgstr "Wachtwoord" 294 294 -
apps/susimail/locale/messages_pl.po
r080cc96 r0a76a0d 293 293 294 294 #: src/src/i2p/susi/webmail/WebMail.java:1583 295 msgid "Pass "296 msgstr "Pass "295 msgid "Password" 296 msgstr "Password" 297 297 298 298 #: src/src/i2p/susi/webmail/WebMail.java:1584 -
apps/susimail/locale/messages_ru.po
r080cc96 r0a76a0d 292 292 293 293 #: src/src/i2p/susi/webmail/WebMail.java:1590 294 msgid "Pass "294 msgid "Password" 295 295 msgstr "Пароль" 296 296 -
apps/susimail/locale/messages_sv.po
r080cc96 r0a76a0d 291 291 292 292 #: src/src/i2p/susi/webmail/WebMail.java:1590 293 msgid "Pass "293 msgid "Password" 294 294 msgstr "Lösen" 295 295 -
apps/susimail/locale/messages_uk.po
r080cc96 r0a76a0d 296 296 297 297 #: src/src/i2p/susi/webmail/WebMail.java:1590 298 msgid "Pass "298 msgid "Password" 299 299 msgstr "Пароль" 300 300 -
apps/susimail/locale/messages_vi.po
r080cc96 r0a76a0d 288 288 289 289 #: src/src/i2p/susi/webmail/WebMail.java:1583 290 msgid "Pass "290 msgid "Password" 291 291 msgstr "Qua" 292 292 -
apps/susimail/locale/messages_zh.po
r080cc96 r0a76a0d 288 288 289 289 #: src/src/i2p/susi/webmail/WebMail.java:1583 290 msgid "Pass "290 msgid "Password" 291 291 msgstr "通过" 292 292 -
apps/susimail/src/src/i2p/susi/webmail/WebMail.java
r080cc96 r0a76a0d 182 182 * @author susi 183 183 */ 184 class IDSorter implements Comparator{184 private static class IDSorter implements Comparator<String> { 185 185 private MailCache mailCache; 186 186 … … 197 197 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) 198 198 */ 199 public int compare( Object arg0, Objectarg1) {200 Mail a = mailCache.getMail( (String)arg0, MailCache.FETCH_HEADER );201 Mail b = mailCache.getMail( (String)arg1, MailCache.FETCH_HEADER );199 public int compare(String arg0, String arg1) { 200 Mail a = mailCache.getMail( arg0, MailCache.FETCH_HEADER ); 201 Mail b = mailCache.getMail( arg1, MailCache.FETCH_HEADER ); 202 202 return a.id - b.id; 203 203 } … … 209 209 * @author susi 210 210 */ 211 class SenderSorter implements Comparator{211 private static class SenderSorter implements Comparator<String> { 212 212 private MailCache mailCache; 213 213 … … 224 224 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) 225 225 */ 226 public int compare( Object arg0, Objectarg1) {227 Mail a = mailCache.getMail( (String)arg0, MailCache.FETCH_HEADER );228 Mail b = mailCache.getMail( (String)arg1, MailCache.FETCH_HEADER );226 public int compare(String arg0, String arg1) { 227 Mail a = mailCache.getMail( arg0, MailCache.FETCH_HEADER ); 228 Mail b = mailCache.getMail( arg1, MailCache.FETCH_HEADER ); 229 229 return a.formattedSender.compareToIgnoreCase( b.formattedSender ); 230 230 } … … 235 235 * @author susi 236 236 */ 237 class SubjectSorter implements Comparator{237 private static class SubjectSorter implements Comparator<String> { 238 238 239 239 private MailCache mailCache; … … 250 250 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) 251 251 */ 252 public int compare( Object arg0, Objectarg1) {253 Mail a = mailCache.getMail( (String)arg0, MailCache.FETCH_HEADER );254 Mail b = mailCache.getMail( (String)arg1, MailCache.FETCH_HEADER );252 public int compare(String arg0, String arg1) { 253 Mail a = mailCache.getMail( arg0, MailCache.FETCH_HEADER ); 254 Mail b = mailCache.getMail( arg1, MailCache.FETCH_HEADER ); 255 255 return a.formattedSubject.compareToIgnoreCase( b.formattedSubject ); 256 256 } … … 261 261 * @author susi 262 262 */ 263 class DateSorter implements Comparator{263 private static class DateSorter implements Comparator<String> { 264 264 265 265 private MailCache mailCache; … … 276 276 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) 277 277 */ 278 public int compare( Object arg0, Objectarg1) {279 Mail a = mailCache.getMail( (String)arg0, MailCache.FETCH_HEADER );280 Mail b = mailCache.getMail( (String)arg1, MailCache.FETCH_HEADER );278 public int compare(String arg0, String arg1) { 279 Mail a = mailCache.getMail( arg0, MailCache.FETCH_HEADER ); 280 Mail b = mailCache.getMail( arg1, MailCache.FETCH_HEADER ); 281 281 return a.date != null ? ( b.date != null ? a.date.compareTo( b.date ) : -1 ) : ( b.date != null ? 1 : 0 ); 282 282 } … … 286 286 * @author susi 287 287 */ 288 class SizeSorter implements Comparator{288 private static class SizeSorter implements Comparator<String> { 289 289 290 290 private MailCache mailCache; … … 301 301 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) 302 302 */ 303 public int compare( Object arg0, Objectarg1) {304 Mail a = mailCache.getMail( (String)arg0, MailCache.FETCH_HEADER );305 Mail b = mailCache.getMail( (String)arg1, MailCache.FETCH_HEADER );303 public int compare(String arg0, String arg1) { 304 Mail a = mailCache.getMail( arg0, MailCache.FETCH_HEADER ); 305 Mail b = mailCache.getMail( arg1, MailCache.FETCH_HEADER ); 306 306 return a.size - b.size; 307 307 } … … 312 312 * @author susi 313 313 */ 314 class SessionObject {314 private static class SessionObject { 315 315 boolean pageChanged, markAll, clear, invert;; 316 316 int state, smtpPort; … … 345 345 * @return html string 346 346 */ 347 private String button( String name, String label )347 private static String button( String name, String label ) 348 348 { 349 349 return "<input type=\"submit\" name=\"" + name + "\" value=\"" + label + "\">"; … … 356 356 * @return html string 357 357 */ 358 private String button2( String name, String label )358 private static String button2( String name, String label ) 359 359 { 360 360 return "<input type=\"submit\" name=\"" + name + "\" value=\"" + label + "\" disabled>"; … … 368 368 * @return 369 369 */ 370 private String sortHeader( String name, String label )370 private static String sortHeader( String name, String label ) 371 371 { 372 372 return "" + label + " <a href=\"" + myself + "?" + name + "=up\"><img src=\"3up.png\" border=\"0\" alt=\"^\"></a><a href=\"" + myself + "?" + name + "=down\"><img src=\"3down.png\" border=\"0\" alt=\"v\"></a>"; … … 378 378 * @param msg 379 379 */ 380 private void debug( PrintWriter out, String msg )380 private static void debug( PrintWriter out, String msg ) 381 381 { 382 382 out.println( "<!-- DEBUG: " + msg + " -->" ); … … 389 389 * @return 390 390 */ 391 private boolean buttonPressed( RequestWrapper request, String key )391 private static boolean buttonPressed( RequestWrapper request, String key ) 392 392 { 393 393 String value = request.getParameter( key ); … … 406 406 * @param level is increased by recursively calling sub parts 407 407 */ 408 private void showPart( PrintWriter out, MailPart mailPart, int level, boolean html )408 private static void showPart( PrintWriter out, MailPart mailPart, int level, boolean html ) 409 409 { 410 410 String br = html ? "<br>\r\n" : "\r\n"; … … 543 543 * @return 544 544 */ 545 private String quoteHTML( String line )545 private static String quoteHTML( String line ) 546 546 { 547 547 if( line != null ) … … 556 556 * @param request 557 557 */ 558 private void processLogin( SessionObject sessionObject, RequestWrapper request )558 private static void processLogin( SessionObject sessionObject, RequestWrapper request ) 559 559 { 560 560 if( sessionObject.state == STATE_AUTH ) { … … 660 660 * @param request 661 661 */ 662 private void processLogout( SessionObject sessionObject, RequestWrapper request )662 private static void processLogout( SessionObject sessionObject, RequestWrapper request ) 663 663 { 664 664 if( buttonPressed( request, LOGOUT ) ) { … … 684 684 * @param request 685 685 */ 686 private void processStateChangeButtons(SessionObject sessionObject, RequestWrapper request )686 private static void processStateChangeButtons(SessionObject sessionObject, RequestWrapper request ) 687 687 { 688 688 /* … … 883 883 * @return 884 884 */ 885 private int getCheckedMessage(RequestWrapper request) {885 private static int getCheckedMessage(RequestWrapper request) { 886 886 for( Enumeration e = request.getParameterNames(); e.hasMoreElements(); ) { 887 887 String parameter = (String)e.nextElement(); … … 903 903 * @param request 904 904 */ 905 private void processGenericButtons(SessionObject sessionObject, RequestWrapper request)905 private static void processGenericButtons(SessionObject sessionObject, RequestWrapper request) 906 906 { 907 907 if( buttonPressed( request, RELOAD ) ) { … … 919 919 * @param request 920 920 */ 921 private void processComposeButtons(SessionObject sessionObject, RequestWrapper request)921 private static void processComposeButtons(SessionObject sessionObject, RequestWrapper request) 922 922 { 923 923 if( buttonPressed( request, NEW_UPLOAD ) ) { … … 997 997 * @param request 998 998 */ 999 private void processMessageButtons(SessionObject sessionObject, RequestWrapper request)999 private static void processMessageButtons(SessionObject sessionObject, RequestWrapper request) 1000 1000 { 1001 1001 if( buttonPressed( request, PREV ) ) { … … 1052 1052 * @return 1053 1053 */ 1054 private MailPart getMailPartFromHashCode( MailPart part, int hashCode )1054 private static MailPart getMailPartFromHashCode( MailPart part, int hashCode ) 1055 1055 { 1056 1056 if( part == null ) … … 1074 1074 * @param request 1075 1075 */ 1076 private void processFolderButtons(SessionObject sessionObject, RequestWrapper request)1076 private static void processFolderButtons(SessionObject sessionObject, RequestWrapper request) 1077 1077 { 1078 1078 /* … … 1166 1166 * @param sort_id 1167 1167 */ 1168 private void processSortingButton(SessionObject sessionObject, RequestWrapper request, String sort_id )1168 private static void processSortingButton(SessionObject sessionObject, RequestWrapper request, String sort_id ) 1169 1169 { 1170 1170 String str = request.getParameter( sort_id ); … … 1316 1316 * @return 1317 1317 */ 1318 private boolean sendAttachment(SessionObject sessionObject, HttpServletResponse response)1318 private static boolean sendAttachment(SessionObject sessionObject, HttpServletResponse response) 1319 1319 { 1320 1320 boolean shown = false; … … 1375 1375 * @return 1376 1376 */ 1377 private boolean sendMail( SessionObject sessionObject, RequestWrapper request )1377 private static boolean sendMail( SessionObject sessionObject, RequestWrapper request ) 1378 1378 { 1379 1379 boolean ok = true; … … 1504 1504 * 1505 1505 */ 1506 @Override 1506 1507 public void doGet( HttpServletRequest request, HttpServletResponse response ) 1507 1508 throws IOException, ServletException … … 1512 1513 * 1513 1514 */ 1515 @Override 1514 1516 public void doPost( HttpServletRequest request, HttpServletResponse response ) 1515 1517 throws IOException, ServletException … … 1523 1525 * @param request 1524 1526 */ 1525 private void showCompose( PrintWriter out, SessionObject sessionObject, RequestWrapper request )1527 private static void showCompose( PrintWriter out, SessionObject sessionObject, RequestWrapper request ) 1526 1528 { 1527 1529 out.println( button( SEND, _("Send") ) + … … 1579 1581 * @param out 1580 1582 */ 1581 private void showLogin( PrintWriter out )1583 private static void showLogin( PrintWriter out ) 1582 1584 { 1583 1585 String fixedPorts = Config.getProperty( CONFIG_PORTS_FIXED, "true" ); … … 1588 1590 1589 1591 out.println( "<table cellspacing=\"0\" cellpadding=\"5\">\n" + 1590 "<tr><td align=\"right\" width=\"30%\">" + _("User") + "</td><td width=\"40%\" align=\"left\"><input type=\"text\" size=\"32\" name=\"" + USER + "\" value=\"" + ( RELEASE ? "" : "test") + "\"></td></tr>\n" + 1591 "<tr><td align=\"right\" width=\"30%\">" + _("Pass") + "</td><td width=\"40%\" align=\"left\"><input type=\"password\" size=\"32\" name=\"pass\" value=\"" + ( RELEASE ? "" : "test") + "\"></td></tr>\n" + 1592 "<tr><td align=\"right\" width=\"30%\">" + _("Host") + "</td><td width=\"40%\" align=\"left\"><input type=\"text\" size=\"32\" name=\"" + HOST +"\" value=\"" + host + "\"" + ( fixed ? " disabled" : "" ) + "></td></tr>\n" + 1593 "<tr><td align=\"right\" width=\"30%\">" + _("POP3-Port") + "</td><td width=\"40%\" align=\"left\"><input type=\"text\" size=\"32\" name=\"" + POP3 +"\" value=\"" + pop3 + "\"" + ( fixed ? " disabled" : "" ) + "></td></tr>\n" + 1594 "<tr><td align=\"right\" width=\"30%\">" + _("SMTP-Port") + "</td><td width=\"40%\" align=\"left\"><input type=\"text\" size=\"32\" name=\"" + SMTP +"\" value=\"" + smtp + "\"" + ( fixed ? " disabled" : "" ) + "></td></tr>\n" + 1595 "<tr><td align=\"center\" colspan=\"2\"><a href=\"http://hq.postman.i2p/?page_id=16\">" + _("Create Account") + "</a> " + button( LOGIN, _("Login") ) + " <input type=\"reset\" value=\"" + _("Reset") + "\"></td></tr>\n" + 1592 "<tr><td align=\"right\" width=\"30%\">" + _("User") + "</td><td width=\"40%\" align=\"left\"><input type=\"text\" size=\"22\" name=\"" + USER + "\" value=\"" + ( RELEASE ? "" : "test") + "\"> @mail.i2p</td></tr>\n" + 1593 "<tr><td align=\"right\" width=\"30%\">" + _("Password") + "</td><td width=\"40%\" align=\"left\"><input type=\"password\" size=\"32\" name=\"pass\" value=\"" + ( RELEASE ? "" : "test") + "\"></td></tr>\n"); 1594 // which is better? 1595 //if (!fixed) { 1596 if (true) { 1597 out.println( 1598 "<tr><td align=\"right\" width=\"30%\">" + _("Host") + "</td><td width=\"40%\" align=\"left\"><input type=\"text\" size=\"22\" name=\"" + HOST +"\" value=\"" + host + "\"" + ( fixed ? " disabled" : "" ) + "></td></tr>\n" + 1599 "<tr><td align=\"right\" width=\"30%\">" + _("POP3-Port") + "</td><td width=\"40%\" align=\"left\"><input type=\"text\" size=\"5\" name=\"" + POP3 +"\" value=\"" + pop3 + "\"" + ( fixed ? " disabled" : "" ) + "></td></tr>\n" + 1600 "<tr><td align=\"right\" width=\"30%\">" + _("SMTP-Port") + "</td><td width=\"40%\" align=\"left\"><input type=\"text\" size=\"5\" name=\"" + SMTP +"\" value=\"" + smtp + "\"" + ( fixed ? " disabled" : "" ) + "></td></tr>\n"); 1601 } 1602 out.println( 1603 "<tr><td></td><td align=\"left\">" + button( LOGIN, _("Login") ) + " <input type=\"reset\" value=\"" + _("Reset") + "\"></td></tr>\n" + 1604 "<tr><td></td><td align=\"left\"><a href=\"http://hq.postman.i2p/?page_id=14\">" + _("Learn about I2P mail") + "</a></td></tr>\n" + 1605 "<tr><td></td><td align=\"left\"><a href=\"http://hq.postman.i2p/?page_id=16\">" + _("Create Account") + "</a></td></tr>\n" + 1596 1606 "</table>"); 1597 1607 } … … 1602 1612 * @param request 1603 1613 */ 1604 private void showFolder( PrintWriter out, SessionObject sessionObject, RequestWrapper request )1614 private static void showFolder( PrintWriter out, SessionObject sessionObject, RequestWrapper request ) 1605 1615 { 1606 1616 if( sessionObject.reallyDelete ) { … … 1671 1681 * @param sessionObject 1672 1682 */ 1673 private void showMessage( PrintWriter out, SessionObject sessionObject )1683 private static void showMessage( PrintWriter out, SessionObject sessionObject ) 1674 1684 { 1675 1685 if( sessionObject.reallyDelete ) { … … 1732 1742 1733 1743 /** translate */ 1734 private String ngettext(String s, String p, int n) {1744 private static String ngettext(String s, String p, int n) { 1735 1745 return Messages.getString(n, s, p); 1736 1746 }
Note: See TracChangeset
for help on using the changeset viewer.