From 3432fb3ab2617299b245d962f1ed4080428bb596 Mon Sep 17 00:00:00 2001
From: Victor <melnikukr@mail.ru>
Date: Fri, 24 Apr 2015 13:37:54 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1=D1=82=D1=80=D0=BE=D0=BA=D0=B8=20=D0=B2?=
 =?UTF-8?q?=D1=8B=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=D1=8B=20=D0=B2=20=D1=80?=
 =?UTF-8?q?=D0=B5=D1=81=D1=83=D1=80=D1=81=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 res/values/strings.xml                              |  8 +++++++-
 src/com/annimon/everlastingsummer/MainActivity.java |  2 +-
 src/com/annimon/everlastingsummer/ViewActivity.java | 12 ++++++------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 151fcad..b7d1169 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7,9 +7,16 @@
     <string name="to_next_scene">Следующая сцена</string>
     <string name="navigate">Навигация</string>
     <string name="save">Сохранить</string>
+    <string name="saved">Сохранено</string>
     <string name="load">Загрузить</string>
+    <string name="loaded">Загружено</string>
     <string name="remove">Удалить</string>
     <string name="removed">Удалено</string>
+    
+    <string name="no_saves">Нет доступных сохранений</string>
+    <string name="no_data">Нет данных для отображения</string>
+    <string name="no_scripts">Нет скриптов в папке %1$s</string>
+    <string name="error_open_file">Ошибка при открытии файла %1$s</string>
 
     <string-array name="menu_items">
         <item>@string/to_prev_scene</item>
@@ -18,5 +25,4 @@
         <item>@string/save</item>
         <item>@string/load</item>
     </string-array>
-
 </resources>
diff --git a/src/com/annimon/everlastingsummer/MainActivity.java b/src/com/annimon/everlastingsummer/MainActivity.java
index 424c7b4..bc229ec 100644
--- a/src/com/annimon/everlastingsummer/MainActivity.java
+++ b/src/com/annimon/everlastingsummer/MainActivity.java
@@ -27,7 +27,7 @@ public final class MainActivity extends ListActivity {
             scripts = null;
         }
         if (scripts == null || scripts.length == 0) {
-            Toast.makeText(this, "Нет скриптов в папке " + PathResolver.SCRIPT_ASSETS,
+            Toast.makeText(this, getString(R.string.no_scripts, PathResolver.SCRIPT_ASSETS),
                     Toast.LENGTH_LONG).show();
             finish();
         }
diff --git a/src/com/annimon/everlastingsummer/ViewActivity.java b/src/com/annimon/everlastingsummer/ViewActivity.java
index adc8965..5a9306e 100644
--- a/src/com/annimon/everlastingsummer/ViewActivity.java
+++ b/src/com/annimon/everlastingsummer/ViewActivity.java
@@ -86,13 +86,13 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
             InputStream stream = null;
             if (save != null) {
                 stream = fromSave(save);
-                Toast.makeText(this, "Загружено", Toast.LENGTH_SHORT).show();
+                Toast.makeText(this, R.string.loaded, Toast.LENGTH_SHORT).show();
             } else if (intent.hasExtra(EXTRA_NAME)) {
                 stream = fromAssets( PathResolver.script(intent.getStringExtra(EXTRA_NAME)) );
             } else if (intent.getData() != null) {
                 stream = fromFile(intent.getData());
             } else {
-                Toast.makeText(this, "Нет данных для отображения", Toast.LENGTH_LONG).show();
+                Toast.makeText(this, R.string.no_data, Toast.LENGTH_LONG).show();
                 finish();
             }
             
@@ -100,7 +100,7 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
             Parser.getInstance().next();
             stream = null;
         } catch (Exception ex) {
-            final String message = "Ошибка при открытии файла " + scriptPath;
+            final String message = getString(R.string.error_open_file, scriptPath);
             if (Logger.DEBUG) Logger.log(message, ex);
             Toast.makeText(this, message, Toast.LENGTH_LONG).show();
             finish();
@@ -398,7 +398,7 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
     private void showLoadStateDialog() {
         final List<SaveInfo> saves = IOUtil.listSaves(getApplicationContext());
         if (saves == null || saves.isEmpty()) {
-            Toast.makeText(this, "Нет доступных сохранений", Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, R.string.no_saves, Toast.LENGTH_SHORT).show();
             return;
         }
         Dialogs.with(this).showSaves(saves, new DialogInterface.OnClickListener() {
@@ -409,7 +409,7 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
                     // Восстанавливаем сохранение текущего сценария.
                     Variables.setVariables(save.getVariables());
                     Parser.getInstance().setPosition(save.getPosition());
-                    Toast.makeText(ViewActivity.this, "Загружено", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(ViewActivity.this, R.string.loaded, Toast.LENGTH_SHORT).show();
                 } else {
                     // Пересоздаём активити
                     final Intent intent = new Intent(ViewActivity.this, ViewActivity.class);
@@ -431,7 +431,7 @@ public final class ViewActivity extends Activity implements TouchGesture.OnTouch
         try {
             final String filename = Long.toString(timestamp);
             IOUtil.writeSaveInfo(getApplicationContext(), filename, info);
-            Toast.makeText(this, "Сохранено", Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, R.string.saved, Toast.LENGTH_SHORT).show();
         } catch (IOException ioe) {
             if (Logger.DEBUG) Logger.log("Ошибка сохранения", ioe);
         }