T27969

diff --git a/workspace/EverMemo/gen/com/yuji/em/R.java b/workspace/EverMemo/gen/com/yuji/em/R.java
index ac11d70..7a8d6d2 100644 (file)
--- a/workspace/EverMemo/gen/com/yuji/em/R.java
+++ b/workspace/EverMemo/gen/com/yuji/em/R.java
@@ -1,107 +1,110 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.\r
- *\r
- * This class was automatically generated by the\r
- * aapt tool from the resource data it found.  It\r
- * should not be modified by hand.\r
- */\r
-\r
-package com.yuji.em;\r
-\r
-public final class R {\r
-    public static final class attr {\r
-    }\r
-    public static final class color {\r
-        public static final int green1=0x7f040001;\r
-        public static final int green2=0x7f040002;\r
-        public static final int note_list_item=0x7f040003;\r
-        public static final int white=0x7f040000;\r
-    }\r
-    public static final class drawable {\r
-        public static final int icon=0x7f020000;\r
-    }\r
-    public static final class id {\r
-        public static final int headerCancelButton=0x7f060003;\r
-        public static final int headerEditText=0x7f060001;\r
-        public static final int headerOkButton=0x7f060002;\r
-        public static final int headerheaderTextView=0x7f060000;\r
-        public static final int mainEditText=0x7f06000b;\r
-        public static final int mainSendButton=0x7f06000a;\r
-        public static final int mainTitle=0x7f060004;\r
-        public static final int mainToggleButton1=0x7f060005;\r
-        public static final int mainToggleButton2=0x7f060006;\r
-        public static final int mainToggleButton3=0x7f060007;\r
-        public static final int mainToggleButton4=0x7f060008;\r
-        public static final int mainToggleButton5=0x7f060009;\r
-        public static final int noteListCloseButton=0x7f06000d;\r
-        public static final int noteListView=0x7f06000c;\r
-        public static final int selectListCancelButton=0x7f060016;\r
-        public static final int selectListConfirmDeleteMsg=0x7f060010;\r
-        public static final int selectListDeleteButton=0x7f060013;\r
-        public static final int selectListEditButton=0x7f060012;\r
-        public static final int selectListLayout=0x7f06000f;\r
-        public static final int selectListNoButton=0x7f060015;\r
-        public static final int selectListTitle=0x7f06000e;\r
-        public static final int selectListView=0x7f060011;\r
-        public static final int selectListYesButton=0x7f060014;\r
-        public static final int settingCloseButton=0x7f06001c;\r
-        public static final int settingHeaderButton=0x7f06001b;\r
-        public static final int settingLayout=0x7f060017;\r
-        public static final int settingMessage=0x7f060018;\r
-        public static final int settingNoteButton=0x7f06001a;\r
-        public static final int settingUserButton=0x7f060019;\r
-        public static final int text1=0x7f06001d;\r
-        public static final int text2=0x7f06001f;\r
-        public static final int text3=0x7f06001e;\r
-        public static final int userCancelButton=0x7f060025;\r
-        public static final int userOkButton=0x7f060024;\r
-        public static final int userPasswordEditText=0x7f060023;\r
-        public static final int userPasswordTextView=0x7f060022;\r
-        public static final int userUserEditText=0x7f060021;\r
-        public static final int userUserTextView=0x7f060020;\r
-    }\r
-    public static final class layout {\r
-        public static final int header=0x7f030000;\r
-        public static final int main=0x7f030001;\r
-        public static final int note_list=0x7f030002;\r
-        public static final int select_note_list=0x7f030003;\r
-        public static final int setting=0x7f030004;\r
-        public static final int simple_list_item_1=0x7f030005;\r
-        public static final int simple_list_item_2=0x7f030006;\r
-        public static final int small_list_item_1=0x7f030007;\r
-        public static final int user_password=0x7f030008;\r
-    }\r
-    public static final class string {\r
-        public static final int app_name=0x7f050000;\r
-        public static final int cancelButton=0x7f050006;\r
-        public static final int closeButton=0x7f050007;\r
-        public static final int deleteButton=0x7f050005;\r
-        public static final int headerEditTitle=0x7f050019;\r
-        public static final int headerExplainText1=0x7f05001a;\r
-        public static final int headerExplainText2=0x7f05001b;\r
-        public static final int headerExplainText3=0x7f05001c;\r
-        public static final int headerExplainText4=0x7f05001d;\r
-        public static final int mainMenuSetting=0x7f050008;\r
-        public static final int mainTitle=0x7f05001e;\r
-        public static final int noButton=0x7f050003;\r
-        public static final int noteListGetting=0x7f050018;\r
-        public static final int selectListConfirmDeleteMsg=0x7f05000b;\r
-        public static final int selectListConfirmNoteMsg=0x7f05000c;\r
-        public static final int selectListConfirmTitle=0x7f05000a;\r
-        public static final int selectListTitle=0x7f050009;\r
-        public static final int selectTitle=0x7f05001f;\r
-        public static final int sendButton=0x7f050001;\r
-        public static final int settingConfirmNoteMsg=0x7f050011;\r
-        public static final int settingConfirmTitle=0x7f05000f;\r
-        public static final int settingConfirmUserMsg=0x7f050010;\r
-        public static final int settingHeaderButton=0x7f050017;\r
-        public static final int settingHeaderTitle=0x7f050014;\r
-        public static final int settingNoteButton=0x7f050016;\r
-        public static final int settingNoteTitle=0x7f050013;\r
-        public static final int settingUserButton=0x7f050015;\r
-        public static final int settingUserTitle=0x7f050012;\r
-        public static final int updateButton=0x7f050004;\r
-        public static final int userPasswordTitle=0x7f05000e;\r
-        public static final int userUserTitle=0x7f05000d;\r
-        public static final int yesButton=0x7f050002;\r
-    }\r
-}\r
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package com.yuji.em;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class color {
+        public static final int green1=0x7f040001;
+        public static final int green2=0x7f040002;
+        public static final int note_list_item=0x7f040003;
+        public static final int white=0x7f040000;
+    }
+    public static final class drawable {
+        public static final int icon=0x7f020000;
+    }
+    public static final class id {
+        public static final int headerCancelButton=0x7f060003;
+        public static final int headerEditText=0x7f060001;
+        public static final int headerOkButton=0x7f060002;
+        public static final int headerheaderTextView=0x7f060000;
+        public static final int mainEditText=0x7f06000b;
+        public static final int mainSendButton=0x7f06000a;
+        public static final int mainTitle=0x7f060004;
+        public static final int mainToggleButton1=0x7f060005;
+        public static final int mainToggleButton2=0x7f060006;
+        public static final int mainToggleButton3=0x7f060007;
+        public static final int mainToggleButton4=0x7f060008;
+        public static final int mainToggleButton5=0x7f060009;
+        public static final int noteListCloseButton=0x7f06000d;
+        public static final int noteListView=0x7f06000c;
+        public static final int selectListCancelButton=0x7f060016;
+        public static final int selectListConfirmDeleteMsg=0x7f060010;
+        public static final int selectListDeleteButton=0x7f060013;
+        public static final int selectListEditButton=0x7f060012;
+        public static final int selectListLayout=0x7f06000f;
+        public static final int selectListNoButton=0x7f060015;
+        public static final int selectListTitle=0x7f06000e;
+        public static final int selectListView=0x7f060011;
+        public static final int selectListYesButton=0x7f060014;
+        public static final int settingCloseButton=0x7f06001c;
+        public static final int settingHeaderButton=0x7f06001b;
+        public static final int settingLayout=0x7f060017;
+        public static final int settingMessage=0x7f060018;
+        public static final int settingNoteButton=0x7f06001a;
+        public static final int settingUserButton=0x7f060019;
+        public static final int text1=0x7f06001d;
+        public static final int text2=0x7f06001f;
+        public static final int text3=0x7f06001e;
+        public static final int userCancelButton=0x7f060025;
+        public static final int userOkButton=0x7f060024;
+        public static final int userPasswordEditText=0x7f060023;
+        public static final int userPasswordTextView=0x7f060022;
+        public static final int userUserEditText=0x7f060021;
+        public static final int userUserTextView=0x7f060020;
+    }
+    public static final class layout {
+        public static final int header=0x7f030000;
+        public static final int main=0x7f030001;
+        public static final int note_list=0x7f030002;
+        public static final int select_note_list=0x7f030003;
+        public static final int setting=0x7f030004;
+        public static final int simple_list_item_1=0x7f030005;
+        public static final int simple_list_item_2=0x7f030006;
+        public static final int small_list_item_1=0x7f030007;
+        public static final int user_password=0x7f030008;
+    }
+    public static final class string {
+        public static final int app_name=0x7f050000;
+        public static final int cancelButton=0x7f050006;
+        public static final int closeButton=0x7f050007;
+        public static final int deleteButton=0x7f050005;
+        public static final int headerEditTitle=0x7f050019;
+        public static final int headerExplainText1=0x7f05001a;
+        public static final int headerExplainText2=0x7f05001b;
+        public static final int headerExplainText3=0x7f05001c;
+        public static final int headerExplainText4=0x7f05001d;
+        public static final int mainMenuSetting=0x7f050008;
+        public static final int mainTitle=0x7f050021;
+        public static final int noButton=0x7f050003;
+        public static final int noteListGetting=0x7f050018;
+        public static final int selectListConfirmDeleteMsg=0x7f05000b;
+        public static final int selectListConfirmNoteMsg=0x7f05000c;
+        public static final int selectListConfirmTitle=0x7f05000a;
+        public static final int selectListTitle=0x7f050009;
+        public static final int selectTitle=0x7f050022;
+        public static final int sendButton=0x7f050001;
+        public static final int settingConfirmNoteMsg=0x7f050011;
+        public static final int settingConfirmTitle=0x7f05000f;
+        public static final int settingConfirmUserMsg=0x7f050010;
+        public static final int settingHeaderButton=0x7f050017;
+        public static final int settingHeaderTitle=0x7f050014;
+        public static final int settingNoteButton=0x7f050016;
+        public static final int settingNoteTitle=0x7f050013;
+        public static final int settingUserButton=0x7f050015;
+        public static final int settingUserTitle=0x7f050012;
+        public static final int toastFailedToGetList=0x7f050020;
+        public static final int toastFailedToWrite=0x7f05001e;
+        public static final int toastNoteDoesNotExist=0x7f05001f;
+        public static final int updateButton=0x7f050004;
+        public static final int userPasswordTitle=0x7f05000e;
+        public static final int userUserTitle=0x7f05000d;
+        public static final int yesButton=0x7f050002;
+    }
+}

diff --git a/workspace/EverMemo/res/values-ja/strings.xml b/workspace/EverMemo/res/values-ja/strings.xml
index 174ecb0..deb90a0 100644 (file)
--- a/workspace/EverMemo/res/values-ja/strings.xml
+++ b/workspace/EverMemo/res/values-ja/strings.xml
@@ -37,4 +37,8 @@
     <string name="headerExplainText2">・「{DATE}」は、現在日付に変換されます。</string>
     <string name="headerExplainText3">・「{TIME}」は、現在時刻に変換されます。</string>
     <string name="headerExplainText4">・例) &lt;hr /&gt;&lt;h3&gt;{DATE} {TIME}&lt;/h3&gt;&lt;hr /&gt;</string>
+
+    <string name="toastFailedToWrite">書き込みに失敗しました</string>
+    <string name="toastNoteDoesNotExist">ノートがありません</string>
+    <string name="toastFailedToGetList">リストの取得に失敗しました</string>
 </resources>

diff --git a/workspace/EverMemo/res/values/strings.xml b/workspace/EverMemo/res/values/strings.xml
index 1440278..4d37e80 100644 (file)
--- a/workspace/EverMemo/res/values/strings.xml
+++ b/workspace/EverMemo/res/values/strings.xml
@@ -37,4 +37,8 @@
     <string name="headerExplainText2">・「{DATE}」is converted to the current date.</string>
     <string name="headerExplainText3">・「{TIME}」is converted to the current time.</string>
     <string name="headerExplainText4">・Example: &lt;hr /&gt;&lt;h3&gt;{DATE} {TIME}&lt;/h3&gt;&lt;hr /&gt;</string>
+
+    <string name="toastFailedToWrite">Failed to write.</string>
+    <string name="toastNoteDoesNotExist">Note does not exist.</string>
+    <string name="toastFailedToGetList">Failed to get list.</string>
 </resources>

diff --git a/workspace/EverMemo/src/com/yuji/em/task/UpdateNoteTask.java b/workspace/EverMemo/src/com/yuji/em/task/UpdateNoteTask.java
index da02687..7decf7f 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/task/UpdateNoteTask.java
+++ b/workspace/EverMemo/src/com/yuji/em/task/UpdateNoteTask.java
@@ -5,6 +5,7 @@ import android.widget.Toast;
 
 import com.evernote.edam.error.EDAMNotFoundException;
 import com.evernote.edam.type.Note;
+import com.yuji.em.R;
 import com.yuji.em.data.NoteDao;
 import com.yuji.em.utility.AsyncTaskIF;
 import com.yuji.em.utility.Debug;
@@ -45,8 +46,9 @@ public class UpdateNoteTask implements AsyncTaskIF {
                                        dao.update(context, n);
                                        status = ERROR_NONE;
                                } else {
-                                       Toast.makeText(context, "\8f\91\82«\8d\9e\82Ý\82É\8e¸\94s\82µ\82Ü\82µ\82½" + text,
-                                                       Toast.LENGTH_LONG); // TODO\81@#27969
+                                       Toast.makeText(context,
+                                                       context.getString(R.string.toastFailedToWrite)
+                                                                       + ":" + text, Toast.LENGTH_LONG); // TODO\81@#27969
                                        Debug.d(this, "doExecute");
                                        status = ERROR_SYSTEM;
                                }
@@ -65,8 +67,10 @@ public class UpdateNoteTask implements AsyncTaskIF {
        public void done(boolean isCancel) {
                switch (status) {
                case ERROR_NOT_FOUND:
-                       Toast.makeText(context, "\83m\81[\83g\82ª\82 \82è\82Ü\82¹\82ñ " + noteName, Toast.LENGTH_LONG)
-                                       .show(); // TODO\81@#27969
+                       Toast.makeText(
+                                       context,
+                                       context.getString(R.string.toastNoteDoesNotExist) + ":"
+                                                       + noteName, Toast.LENGTH_LONG).show(); // TODO\81@#27969
                        break;
                }