Add default value for butler and yourname in strings.

domogik · Aug 1, 2015 · b62f6ee · b62f6ee
1 parent 22a0df5
commit b62f6ee
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
@@ -363,4 +363,12 @@
 	<string name="snow_showers">Averses de neige</string>
 	<string name="solated_thundershower">Pluies d\'orages locales</string>
 
+	<string name="butler">majordome</string>
+	<string name="action_settings">Parametres</string>
+    <string name="title_activity_main">Domogik Butler</string>
+    <string name="title_activity_home">HomeActivity</string>
+    <string name="title_activity_settings">Parametres</string>
+    <string name="pref_header_mq">MQ</string>
+    <string name="butler_default_name">Majordome</string>
+    <string name="you_default_name">Vous</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -314,5 +314,7 @@
     <string name="title_activity_home">HomeActivity</string>
     <string name="title_activity_settings">Settings</string>
     <string name="pref_header_mq">MQ</string>
+    <string name="butler_default_name">Butler</string>
+    <string name="you_default_name">You</string>
 
 </resources>
diff --git a/src/mq/Main.java b/src/mq/Main.java
@@ -137,7 +137,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                     ArrayList<String> result = data
                             .getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS);
                     // Toast.makeText(getApplicationContext(), result.get(0), Toast.LENGTH_SHORT).show();
-                    String yourName = SP.getString("dmg_your_name", "You");    // TODO : use a R. for the default value
+                    String yourName = SP.getString("dmg_your_name", getString(R.string.you_default_name));
                     chatHistoryList.add(yourName + " > " + result.get(0));
                     arrayAdapter.notifyDataSetChanged();
                     chatHistory.setSelection(arrayAdapter.getCount() - 1);
@@ -218,7 +218,7 @@ public void onReceive(Context context, Intent intent)  {
                 //Toast.makeText(this.context, message.getMessage(), Toast.LENGTH_SHORT).show();
                 // Toast.makeText(this.context, response, Toast.LENGTH_SHORT).show();
                 speaker.speak(response);
-                String butlerName = SP.getString("dmg_butler_name", "Butler");    // TODO : use a R. for the default value
+                String butlerName = SP.getString("dmg_butler_name",getString(R.string.butler_default_name));
                 chatHistoryList.add(butlerName + " > " + response);
                 arrayAdapter.notifyDataSetChanged();
                 chatHistory.setSelection(arrayAdapter.getCount() - 1);