erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-10 02:45:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Tidy up more strings

Browse source
This commit is contained in:
Darcy Wong 2018-10-24 10:44:20 +07:00
parent 8ce4b4f30b
commit 1f3cd5268b
8 changed files with 45 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/InfoActivity.java
View file

@ -58,7 +58,7 @@ public class InfoActivity extends AppCompatActivity {
PackageInfo pInfo;
try {
pInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
ver = String.format("Version: %s", pInfo.versionName);
ver = String.format("%s: %s", getString(R.string.title_version), pInfo.versionName);
} catch (NameNotFoundException e) {
// Could not get version number
}

8
android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
View file

@ -298,7 +298,9 @@ public class MainActivity extends AppCompatActivity implements OnKeyboardEventLi
downloadIntent.putExtra("receiver", resultReceiver);
progressDialog = new ProgressDialog(MainActivity.this);
progressDialog.setMessage(getString(R.string.downloading_keyboard_package) + "\n" + filename + "...");
String ellipsisStr = "\u2026";
progressDialog.setMessage(String.format("%s\n%s%s",
getString(R.string.downloading_keyboard_package), filename, ellipsisStr));
progressDialog.setCancelable(false);
progressDialog.show();
@ -509,7 +511,7 @@ public class MainActivity extends AppCompatActivity implements OnKeyboardEventLi
final View textSizeController = inflater.inflate(R.layout.text_size_controller, null);
final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(MainActivity.this);
dialogBuilder.setIcon(R.drawable.ic_light_action_textsize);
dialogBuilder.setTitle(String.format(getString(R.string.text_size) + ": %d", textSize));
dialogBuilder.setTitle(String.format("%s: %d", getString(R.string.action_text_size), textSize));
dialogBuilder.setView(textSizeController);
dialogBuilder.setPositiveButton(getString(R.string.label_ok), new DialogInterface.OnClickListener() {
@Override
@ -540,7 +542,7 @@ public class MainActivity extends AppCompatActivity implements OnKeyboardEventLi
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
textSize = progress + minTextSize;
textView.setTextSize((float) textSize);
dialog.setTitle(String.format(getString(R.string.text_size) + ": %d", textSize));
dialog.setTitle(String.format("%s: %d", getString(R.string.action_text_size), textSize));
}
});

13
android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java
View file

@ -61,7 +61,8 @@ public class PackageActivity extends AppCompatActivity {
try {
tempPackagePath = PackageProcessor.unzipKMP(kmpFile);
} catch (Exception e) {
String message = getString(R.string.failed_to_extract) + "\n" + kmpFile.getAbsolutePath();
String message = String.format("%s\n%s",
getString(R.string.failed_to_extract), kmpFile.getAbsolutePath());
showErrorDialog(context, pkgId, message);
}
@ -80,7 +81,7 @@ public class PackageActivity extends AppCompatActivity {
packageActivityTitle.setTextSize(getResources().getDimension(R.dimen.titlebar_label_textsize));
packageActivityTitle.setGravity(Gravity.CENTER);
String titleStr = getString(R.string.install_keyboard_package) + pkgVersion;
String titleStr = String.format("%s %s", getString(R.string.install_keyboard_package), pkgVersion);
packageActivityTitle.setText(titleStr);
getSupportActionBar().setCustomView(packageActivityTitle);
@ -139,7 +140,8 @@ public class PackageActivity extends AppCompatActivity {
webView.loadUrl("file:///" + files[0].getAbsolutePath());
} else {
// No welcome.htm so display minimal package information
String keyboardString = (pkgName != null && pkgName.toLowerCase().endsWith("keyboard")) ? "" : " Keyboard ";
String keyboardString = (pkgName != null && pkgName.toLowerCase().endsWith("keyboard")) ? "" :
String.format(" %s", getString(R.string.title_keyboard));
String htmlString = String.format(
"<body style=\"max-width:600px;\"><H1>The %s%s Package</H1></body>",
pkgName, keyboardString);
@ -216,11 +218,12 @@ public class PackageActivity extends AppCompatActivity {
private void showErrorDialog(Context context, String pkgId, String message) {
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context);
alertDialogBuilder.setTitle(getString(R.string.title_package) + pkgId + getString(R.string.failed_to_install));
alertDialogBuilder.setTitle(String.format("%s %s %s",
getString(R.string.title_package), pkgId, getString(R.string.title_failed_to_install)));
alertDialogBuilder
.setMessage(message)
.setCancelable(false)
.setNeutralButton(getString(R.string.label_close),new DialogInterface.OnClickListener() {
.setPositiveButton(getString(R.string.label_close),new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,int id) {
if (dialog != null) {
dialog.dismiss();

2
android/KMAPro/kMAPro/src/main/res/layout/activity_splash_screen.xml
View file

@ -13,7 +13,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/splash_version"
android:text="@string/title_version"
android:textSize="@dimen/activity_splash_textsize" />
<TextView

24
android/KMAPro/kMAPro/src/main/res/values/strings.xml
View file

@ -2,26 +2,30 @@
<resources>
<string name="app_name" translatable="false">Keyman</string>
<string name="splash_version" translatable="false">Version</string>
<string name="splash_copyright" translatable="false">Copyright &#169; 1992-</string>
<string name="action_share" translatable="false">Share</string>
<string name="action_web" translatable="false">Web Browser</string>
<string name="action_text_size" translatable="false">Text Size</string>
<string name="action_overflow" translatable="false">More</string>
<string name="action_clear_text" translatable="false">Clear Text</string>
<string name="action_info" translatable="false">Info</string>
<string name="title_version" translatable="false">Version</string>
<!-- &#8230; is the ellipsis character "..." -->
<string name="textview_hint" translatable="false">Start typing here&#8230;</string>
<!-- Text Size -->
<string name="text_size" translatable="false">Text size</string>
<!-- Splash screen (version/copyright info currently disabled -->
<string name="splash_copyright" translatable="false">Copyright &#169; 1992-</string>
<!-- Text Size dialog -->
<string name="ic_text_size_up" translatable="false">Text size up</string>
<string name="ic_text_size_down" translatable="false">Text size down</string>
<!-- Clear Text -->
<!-- Clear Text dialog -->
<string name="all_text_will_be_cleared" translatable="false">All text will be cleared</string>
<!-- Get started menu strings -->
<!-- Info screen reuses title_version -->
<!-- Get Started menu strings -->
<string name="get_started" translatable="false">Get Started</string>
<string name="add_a_keyboard" translatable="false">Add a keyboard for your language</string>
<string name="enable_system_keyboard" translatable="false">Enable Keyman as system-wide keyboard</string>
@ -38,11 +42,11 @@
<string name="hint_url" translatable="false">Url</string>
<!-- Keyboard Package strings -->
<string name="title_package" translatable="false">Package </string>
<string name="failed_to_install" translatable="false"> failed to install</string>
<string name="title_package" translatable="false">Package</string>
<string name="title_failed_to_install" translatable="false">failed to install</string>
<string name="downloading_keyboard_package" translatable="false">Downloading keyboard package</string>
<string name="failed_to_extract" translatable="false">Failed to extract</string>
<string name="install_keyboard_package" translatable="false">Install Keyboard Package </string>
<string name="install_keyboard_package" translatable="false">Install Keyboard Package</string>
<string name="no_new_touch_keyboards_to_install" translatable="false">No new touch-optimized keyboards to install</string>
<string name="no_valid_touch_keyboards_to_install" translatable="false">No valid touch-optimized keyboards to install</string>

6
android/KMEA/app/src/main/java/com/tavultesoft/kmea/KMKeyboardDownloaderActivity.java
View file

@ -106,7 +106,7 @@ public class KMKeyboardDownloaderActivity extends AppCompatActivity {
Bundle args = new Bundle();
String title = "";
if (url != null) {
title = "Custom Keyboard: " + filename;
title = String.format("%s: %s", getString(R.string.custom_keyboard), filename);
} else if (customKeyboard != null && customLanguage != null &&
!customKeyboard.trim().isEmpty() && !customLanguage.trim().isEmpty()) {
int kbIndex = KMManager.getKeyboardIndex(getApplicationContext(), customKeyboard, customLanguage);
@ -117,10 +117,10 @@ public class KMKeyboardDownloaderActivity extends AppCompatActivity {
return; // false
}
title = customLanguage + "_" + customKeyboard;
title = String.format("%s_%s", customLanguage, customKeyboard);
} else {
// Download keyboard from cloud server
title = langName + ": " + kbName;
title = String.format("%s: %s", langName, kbName);
}
DialogFragment dialog = new ConfirmDialogFragment();

6
android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardPickerActivity.java
View file

@ -164,7 +164,7 @@ public final class KeyboardPickerActivity extends AppCompatActivity implements O
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context);
dialogBuilder.setTitle(getString(R.string.title_add_keyboard));
dialogBuilder.setIcon(context.getResources().getDrawable(android.R.drawable.ic_input_add));
dialogBuilder.setMessage("\n" + getString(R.string.cannot_connect) + "\n");
dialogBuilder.setMessage(String.format("\n%s\n", getString(R.string.cannot_connect)));
dialogBuilder.setPositiveButton(getString(R.string.label_ok), null);
AlertDialog dialog = dialogBuilder.create();
dialog.show();
@ -525,7 +525,7 @@ public final class KeyboardPickerActivity extends AppCompatActivity implements O
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context);
dialogBuilder.setTitle(context.getString(R.string.title_add_keyboard));
dialogBuilder.setIcon(context.getResources().getDrawable(android.R.drawable.ic_input_add));
dialogBuilder.setMessage("\n" + context.getString(R.string.cannot_connect) + "\n");
dialogBuilder.setMessage(String.format("\n%s\n", context.getString(R.string.cannot_connect)));
dialogBuilder.setPositiveButton(context.getString(R.string.label_ok), null);
AlertDialog dialog = dialogBuilder.create();
dialog.show();
@ -619,7 +619,7 @@ public final class KeyboardPickerActivity extends AppCompatActivity implements O
failedUpdateCount = 0;
updateCount = result;
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context);
dialogBuilder.setTitle(context.getString(R.string.keyboard_update_available));
dialogBuilder.setTitle(context.getString(R.string.keyboard_updates_available));
dialogBuilder.setMessage(context.getString(R.string.confirm_update));
dialogBuilder.setPositiveButton(context.getString(R.string.label_update), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {

16
android/KMEA/app/src/main/res/values/strings.xml
View file

@ -4,11 +4,12 @@
<!-- Device type -->
<string name="device_type" translatable="false">AndroidMobile</string>
<!-- Application name -->
<!-- Application name (Keyman Engine for Android) -->
<string name="app_name" translatable="false">KMEA</string>
<!-- Title for lists-->
<string name="title_keyboards" translatable="false">Keyboards</string>
<string name="title_keyboard" translatable="false">Keyboard</string>
<string name="title_add_keyboard" translatable="false">Add New Keyboard</string>
<!-- Button labels -->
@ -21,15 +22,18 @@
<string name="label_ok" translatable="false">OK</string>
<string name="label_update" translatable="false">Update</string>
<!-- For the following, &#8230; is the ellipsis character "..." -->
<!-- Keyboard Updates -->
<string name="cannot_connect" translatable="false">Cannot connect to Keyman server!</string>
<string name="checking_keyboard_updates" translatable="false">Checking keyboard updates...</string>
<string name="checking_keyboard_updates" translatable="false">Checking keyboard updates&#8230;</string>
<string name="confirm_download" translatable="false">Would you like to download this keyboard?</string>
<string name="confirm_update" translatable="false">Would you like to update keyboards now?</string>
<string name="downloading_keyboard" translatable="false">Downloading keyboard...</string>
<string name="keyboard_update_available" translatable="false">Keyboard Updates Available</string>
<string name="loading" translatable="false">Loading...</string>
<string name="updating_keyboards" translatable="false">Updating keyboards...</string>
<string name="custom_keyboard" translatable="false">Custom Keyboard</string>
<string name="downloading_keyboard" translatable="false">Downloading keyboard&#8230;</string>
<string name="keyboard_updates_available" translatable="false">Keyboard Updates Available</string>
<string name="loading" translatable="false">Loading&#8230;</string>
<string name="updating_keyboards" translatable="false">Updating keyboards&#8230;</string>
<!-- Keyboard Info -->
<string name="keyboard_version" translatable="false">Keyboard version</string>