I2P_Developers/i2p.android.base
3
0
Fork 2
Code Issues 39 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Converted hard-coded log strings to translatable strings

Browse Source
This commit is contained in:
str4d
2015-05-08 10:59:19 +00:00
parent 1b2fa9bda6
commit 7675d78d0d
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/net/i2p/android/router/log/LogFragment.java
View File

@ -113,8 +113,8 @@ public class LogFragment extends ListFragment implements
I2PAppContext ctx = I2PAppContext.getCurrentContext();
if (ctx != null) {
setEmptyText("ERROR".equals(mLogLevel) ?
"No error messages" : "No messages");
setEmptyText(getString("ERROR".equals(mLogLevel) ?
R.string.no_error_messages : R.string.no_messages));
setListShown(false);
getLoaderManager().initLoader("ERROR".equals(mLogLevel) ?
@ -206,19 +206,9 @@ public class LogFragment extends ListFragment implements
}
/** fixme plurals */
private static String getHeader(int sz, boolean errorsOnly) {
if (errorsOnly) {
if (sz == 0)
return "No error messages";
if (sz == 1)
return "1 error message";
return sz + " error messages, newest first";
}
if (sz == 0)
return "No messages";
if (sz == 1)
return "1 message";
return sz + " messages, newest first";
private static String getHeader(Context ctx, int sz, boolean errorsOnly) {
return ctx.getResources().getQuantityString(errorsOnly ?
R.plurals.log_error_messages : R.plurals.log_messages, sz, sz);
}
// LoaderManager.LoaderCallbacks<List<String>>
@ -237,7 +227,7 @@ public class LogFragment extends ListFragment implements
mLogEntries.addAll(data);
}
mAdapter.setData(data);
String header = getHeader(data.size(), ("ERROR".equals(mLogLevel)));
String header = getHeader(getActivity(), data.size(), ("ERROR".equals(mLogLevel)));
mHeaderView.setText(header);
if (isResumed()) {

12
app/src/main/res/values/strings.xml
View File

@ -333,6 +333,18 @@
<string name="signature_type">Signature type</string>
<string name="custom_options">Custom options</string>
<string name="no_messages">No messages</string>
<string name="no_error_messages">No error messages</string>
<plurals name="log_error_messages">
<item quantity="zero">@string/no_error_messages</item>
<item quantity="one">One error message</item>
<item quantity="other">%d error messages, newest first</item>
</plurals>
<plurals name="log_messages">
<item quantity="zero">@string/no_messages</item>
<item quantity="one">One message</item>
<item quantity="other">%d messages, newest first</item>
</plurals>
<string name="log_entry">Log Entry</string>
<string name="copy_logs">Copy logs</string>
<string name="i2p_android_error_logs">I2P Android Error Logs</string>