From 4e58654c10d6f8530d6af59be3dda049931159c6 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Thu, 1 Mar 2018 21:50:13 +0300 Subject: [PATCH] Remove hardcoded strings to proper translation --- res/layout/activity_launcher.xml | 10 +- res/values/strings.xml | 121 ++++++++++++++------- src/in/celest/xash3d/FPicker.java | 33 ++---- src/in/celest/xash3d/LauncherActivity.java | 8 +- 4 files changed, 99 insertions(+), 73 deletions(-) diff --git a/res/layout/activity_launcher.xml b/res/layout/activity_launcher.xml index 829b6001..3069e592 100644 --- a/res/layout/activity_launcher.xml +++ b/res/layout/activity_launcher.xml @@ -215,7 +215,7 @@ android:layout_marginLeft="10dp" android:layout_marginRight="10dp" android:layout_marginTop="3dp" - android:text="Pixel Format" + android:text="@string/pixel_format" android:textAppearance="?android:attr/textAppearanceMedium" /> + android:textOff="@string/resize_off" + android:textOn="@string/resize_on" /> - + android:text="@string/update_to_beta" />--> - Xash3D - Xash3D - Xash3D (test) + Xash3D FWGS + Xash3D FWGS + Xash3D FWGS Test v0.19.1 - - Launch Xash3D! - Command line arguments(experts only) + + + Cancel + Ok + Next + Previous + Skip + Finish + Exit Path to game resources - Controls settings - Xash3D shortcut - Xash3D_test shortcut + + + + Normal + Advanced + + + + Normal settings + Volume buttons mode + Default action + Use in game + Select game data location + Create mod shortcut + + + + Advanced settings + Command line arguments(experts only) + Pixel format + Keyboard does not resize screen + Keyboard resizes screen + Check updates on start + + Enable Immersive Mode(fullscreen, KitKat or higher) + Fixed screen resolution (experimental) + Scale screen keeping aspect ratio + Specify custom screen width and height + Resolution: + Use with caution! Some games does not support too low resolution, in case of bugs increase resolution to 640x480 or higher.\n + Resolution lower than 320x240 is not allowed. + + + + About + Launch Xash3D FWGS! + + + + Xash3D FWGS shortcut + Xash3D FWGS Test shortcut Save shortcut Mod directory Mod package name (experts only) Shortcut name - - Xash3D Android - FWGS is not affiliated with Valve or any of their partners. All copyrights reserved to their respective owners. + + + + Xash3D FWGS + Flying With Gauss is not affiliated with Valve or any of their partners. All copyrights reserved to their respective owners. - Port to Android by FWGS team: \n + Port to Android by Flying With Gauss team: \n • a1batross\n • mittorn \n • nicknekit\n @@ -37,28 +83,16 @@ • ModDB\n • GitHub - About - Create mod shortcut - Select game data location - Normal - Advanced - Normal settings - Advanced settings - Volume buttons mode - Default action - Use in game - Set current folder - Check updates on start - Update to unstable version if available + + + %s is available! Download it now! Update - Cancel - Ok No updates was found Working... - Enable Immersive Mode(fullscreen, KitKat or higher) + - + Write test has failed Move your game files somewhere else, for example Android/data/in.celest.xash3d.hl or internal memory. At next run I will ask you about folder again. @@ -66,17 +100,22 @@ Due to writing politics of newer Android versions, you can\'t use this storage. Due to writing politics of Android 4.4, you can\'t use this storage. Seems you have read-only filesystem. + - Fixed screen resolution (experimental) - Scale screen keeping aspect ratio - Specify custom screen width and height - Resolution: -
Use with caution! Some games does not support too low resolution, in case of bugs increase resolution to 640x480 or higher.\n - Resolution lower than 320x240 is not allowed. + Open installation guide - Next - Prev - Skip - Finish - Exit + + + + Set current folder + Parent directory + Chosen path: + Current directory: + + + No items + %d item + %d items + + diff --git a/src/in/celest/xash3d/FPicker.java b/src/in/celest/xash3d/FPicker.java index 6e2f1707..eb92aa40 100644 --- a/src/in/celest/xash3d/FPicker.java +++ b/src/in/celest/xash3d/FPicker.java @@ -85,24 +85,22 @@ public class FPicker extends Activity { while( dirs == null ) { String parent = folder.getParent(); - if (parent != null) - folder = new File(parent); - else - folder = new File(Environment.getExternalStorageDirectory().toString()); + folder = new File( parent != null ? parent : Environment.getExternalStorageDirectory().toString() ); dirs = folder.listFiles(); } - for(File ff: dirs) + for( File ff: dirs ) { Date lastModDate = new Date(ff.lastModified()); DateFormat formater = DateFormat.getDateTimeInstance(); String date_modify = formater.format(lastModDate); if(ff.isDirectory()) { - boolean isXashDir=false; + boolean isXashDir = false; File[] fbuf = ff.listFiles(); int buf = 0; - if(fbuf != null&&fbuf.length<20) + + if( fbuf != null && fbuf.length < 20 ) { buf = fbuf.length; for (File valves: fbuf) @@ -112,33 +110,22 @@ public class FPicker extends Activity { } } - String num_item = String.valueOf(buf); - if(buf == 0) - num_item = "Some items"; - else - num_item +=" items"; - if( isXashDir ) - { - dir.add(new Item(ff.getName(), num_item, date_modify, ff.getAbsolutePath(), R.drawable.ic_launcher)); - } - else - { - dir.add(new Item(ff.getName(), num_item, date_modify, ff.getAbsolutePath(), R.drawable.folder)); - } + String num_item = res.getQuantityString(R.plurals.item_plurals, buf, buf); + dir.add(new Item(ff.getName(), num_item, date_modify, ff.getAbsolutePath(), isXashDir ? R.drawable.ic_launcher : R.drawable.folder )); } } Collections.sort(dir); if(folder.getPath().length() > 1) - dir.add(0, new Item( "..", "Parent Directory", "", folder.getParent(), R.drawable.folder)); + dir.add(0, new Item( "..", R.string.parent_directory, "", folder.getParent(), R.drawable.folder)); return dir; } protected void onPostExecute(List dir) { - setTitle("Current Dir: "+folder.getName()); + setTitle(R.string.current_dir + " " +folder.getName()); adapter = new FileArrayAdapter(FPicker.this,R.layout.row,dir); delta = (ListView)findViewById(R.id.FileView); @@ -159,7 +146,7 @@ public class FPicker extends Activity { public void onFileClick(View v) { - Toast.makeText(this, "Chosen path : " + currentDir, Toast.LENGTH_SHORT).show(); + Toast.makeText(this, R.string.chosen_path + " " + currentDir, Toast.LENGTH_SHORT).show(); Intent intent = new Intent(); intent.putExtra("GetPath",currentDir.toString()); setResult(RESULT_OK, intent); diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java index fcc215ec..8833eae8 100644 --- a/src/in/celest/xash3d/LauncherActivity.java +++ b/src/in/celest/xash3d/LauncherActivity.java @@ -28,7 +28,7 @@ public class LauncherActivity extends Activity { static ToggleButton useVolume; static ToggleButton resizeWorkaround; static CheckBox checkUpdates; - static CheckBox updateToBeta; + //static CheckBox updateToBeta; static CheckBox immersiveMode; static SharedPreferences mPref; static Spinner pixelSpinner; @@ -136,7 +136,7 @@ public class LauncherActivity extends Activity { useVolume = (ToggleButton) findViewById( R.id.useVolume ); resPath = (EditText) findViewById( R.id.cmdPath ); checkUpdates = (CheckBox)findViewById( R.id.check_updates ); - updateToBeta = (CheckBox)findViewById( R.id.check_betas ); + //updateToBeta = (CheckBox)findViewById( R.id.check_betas ); pixelSpinner = (Spinner) findViewById( R.id.pixelSpinner ); resizeWorkaround = (ToggleButton) findViewById( R.id.enableResizeWorkaround ); tvResPath = (TextView) findViewById( R.id.textView_path ); @@ -196,7 +196,7 @@ public class LauncherActivity extends Activity { }); useVolume.setChecked(mPref.getBoolean("usevolume",true)); checkUpdates.setChecked(mPref.getBoolean("check_updates",true)); - updateToBeta.setChecked(mPref.getBoolean("check_betas", false)); + //updateToBeta.setChecked(mPref.getBoolean("check_betas", false)); updatePath(mPref.getString("basedir", FWGSLib.getDefaultXashPath() ) ); cmdArgs.setText(mPref.getString("argv","-dev 3 -log")); pixelSpinner.setSelection(mPref.getInt("pixelformat", 0)); @@ -274,7 +274,7 @@ public class LauncherActivity extends Activity { if( !XashConfig.GP_VERSION && // disable autoupdater for Google Play mPref.getBoolean("check_updates", true)) { - new CheckUpdate(true, updateToBeta.isChecked()).execute(UPDATE_LINK); + new CheckUpdate(true, false).execute(UPDATE_LINK); } changeButtonsStyle((ViewGroup)tabHost.getParent()); hideResolutionSettings( !enableResolutionChange );