AmineB/LesHoraires
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3 from DevHugo/internationalisation_chaine_code

Browse Source 
Quelques chaines ne sont pas internationalise
This commit is contained in:
Amine Bou 2015-06-13 17:18:58 +02:00
commit 1196c351cc
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Les Horaires/src/main/java/com/amine/horaires/ShopSearch.java
View File

@ -57,7 +57,7 @@ public class ShopSearch extends OptionsActivity {
@Override @Override
public void gotLocation(Location location) { public void gotLocation(Location location) {
if (location == null) { if (location == null) {
Toast.makeText(getApplicationContext(), "Petit soucis lors de la localisation", Toast.LENGTH_SHORT).show(); Toast.makeText(getApplicationContext(), getResources().getString(R.string.fail_localize_user), Toast.LENGTH_SHORT).show();
} else { } else {
URL url = Utils.generateUrlForLatLng(name.getText().toString(), location.getLatitude() + "", location.getLongitude() + ""); URL url = Utils.generateUrlForLatLng(name.getText().toString(), location.getLatitude() + "", location.getLongitude() + "");
SearchTask s = new SearchTask(); SearchTask s = new SearchTask();
@ -69,7 +69,7 @@ public class ShopSearch extends OptionsActivity {
boolean gotLocation = myLocation.getLocation(getApplicationContext(), boolean gotLocation = myLocation.getLocation(getApplicationContext(),
locationResult); locationResult);
if (!gotLocation) { if (!gotLocation) {
Toast.makeText(getApplicationContext(), "Erreur de localisation.", Toast.LENGTH_SHORT).show(); Toast.makeText(getApplicationContext(), getResources().getString(R.string.fail_localize_user), Toast.LENGTH_SHORT).show();
} }
} }
}); });

2
Les Horaires/src/main/java/com/amine/horaires/ShopUpdate.java
View File

@ -138,7 +138,7 @@ public class ShopUpdate extends OptionsActivity {
protected void onPostExecute(String string) { protected void onPostExecute(String string) {
loading.setVisibility(View.GONE); loading.setVisibility(View.GONE);
super.onPostExecute(string); super.onPostExecute(string);
Toast.makeText(getApplicationContext(), "Mise à jour effectuée!", Toast.LENGTH_SHORT).show(); Toast.makeText(getApplicationContext(), getResources().getString(R.string.success_update_shop), Toast.LENGTH_SHORT).show();
} }
} }
} }

4
Les Horaires/src/main/java/com/amine/horaires/UpdateAdapter.java
View File

@ -66,7 +66,7 @@ class UpdateAdapter extends ArrayAdapter<Horaires> {
h.setFrom_h(hours); h.setFrom_h(hours);
h.setFrom_m(minutes); h.setFrom_m(minutes);
} else { } else {
Toast.makeText(context, "Merci d'utiliser des tranches de 5 minutes maximum", Toast.LENGTH_SHORT).show(); Toast.makeText(context, getContext().getResources().getString(R.string.time_slot_error), Toast.LENGTH_SHORT).show();
} }
} }
}, h.getFrom_h(), h.getFrom_m(), true); }, h.getFrom_h(), h.getFrom_m(), true);
@ -85,7 +85,7 @@ class UpdateAdapter extends ArrayAdapter<Horaires> {
h.setTo_h(hours); h.setTo_h(hours);
h.setTo_m(minutes); h.setTo_m(minutes);
} else { } else {
Toast.makeText(context, "Merci d'utiliser des tranches de 5 minutes maximum", Toast.LENGTH_SHORT).show(); Toast.makeText(context, getContext().getResources().getString(R.string.time_slot_error), Toast.LENGTH_SHORT).show();
} }
} }
}, h.getTo_h(), h.getTo_m(), true); }, h.getTo_h(), h.getTo_m(), true);

3
Les Horaires/src/main/res/values-v21/strings.xml
View File

@ -26,6 +26,9 @@
<string name="changelog_ok_button">OK</string> <string name="changelog_ok_button">OK</string>
<string name="changelog_show_full">Plus…</string> <string name="changelog_show_full">Plus…</string>
<string name="contact">Contacter le dev</string> <string name="contact">Contacter le dev</string>
<string name="time_slot_error">Merci d'utiliser des tranches de 5 minutes maximum</string>
<string name="success_update_shop">Mise à jour effectuée!</string>
<string name="fail_localize_user">Petit soucis lors de la localisation</string>
<string-array name="days_arrays"> <string-array name="days_arrays">
<item>Lundi</item> <item>Lundi</item>
<item>Mardi</item> <item>Mardi</item>

3
Les Horaires/src/main/res/values/strings.xml
View File

@ -25,6 +25,9 @@
<string name="changelog_ok_button">OK</string> <string name="changelog_ok_button">OK</string>
<string name="changelog_show_full">Plus…</string> <string name="changelog_show_full">Plus…</string>
<string name="contact">Contacter le dev</string> <string name="contact">Contacter le dev</string>
<string name="time_slot_error">Merci d'utiliser des tranches de 5 minutes maximum</string>
<string name="success_update_shop">Mise à jour effectuée!</string>
<string name="fail_localize_user">Petit soucis lors de la localisation</string>
<string-array name="days_arrays"> <string-array name="days_arrays">
<item>Lundi</item> <item>Lundi</item>
<item>Mardi</item> <item>Mardi</item>