internationalized further strings

mobile/com.sap.sailing.racecommittee.app/res/layout/race_finished_view.xml

@@ -113,7 +113,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="0.2"
-            android:text="Confirm positionings"
+            android:text="@string/confirm_positionings"
             android:textSize="14pt"
             android:ems="10"
             android:visibility="gone" />
@@ -123,10 +123,11 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="0.8"
-            android:text="Snap"
+            android:text="@string/snap"
             android:src="@drawable/ic_menu_camera"
             android:textSize="14pt"
-            android:ems="10" />
+            android:ems="10"
+            android:contentDescription="@string/snap" />
     </LinearLayout>
 
 </LinearLayout>

mobile/com.sap.sailing.racecommittee.app/res/layout/race_positioning_view.xml

@@ -77,7 +77,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="center_vertical|center_horizontal"
-            android:text="Confirm positioning"
+            android:text="@string/confirm_positionings"
             android:visibility="gone" />
     </LinearLayout>
 

mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml

@@ -28,15 +28,15 @@
     <string name="abort_starting_phase">Abbruch Startphase</string>
     <string name="abort_running_race">Abbruch</string>
     <string name="choose_xray_flag_up">Einzelrückruf</string>
-    <string name="choose_golf_flag_down">Unset Golf Flag</string>
+    <string name="choose_golf_flag_down">Hole Golf Flagge ein</string>
     <string name="choose_xray_flag_down">Einzelrückruf abschließen</string>
-    <string name="choose_first_substitute_flag">Rückruf</string>
-    <string name="choose_blue_flag">Zielphase beginnen</string>
+    <string name="choose_first_substitute_flag">Gesamtrückruf</string>
+    <string name="choose_blue_flag">Zieleinlauf beginnen</string>
     <string name="flag_papa">Papa</string>
     <string name="flag_zulu">Zulu</string>
     <string name="flag_india">India</string>
     <string name="flag_black">Black</string>
-    <string name="flag_ap">AP Flag</string>
+    <string name="flag_ap">AP Flagge</string>
     <string name="flag_november">November</string>
     <string name="flag_Xray">Xray</string>
     <string name="flag_jury">Jury</string>
@@ -55,7 +55,7 @@
     <string name="racelist_scheduled">Geplant für %s</string>
     <string name="racelist_startphase">Start um %s läuft</string>
     <string name="racelist_running">Gestartet um %s</string>
-    <string name="racelist_finishing">Zielphase</string>
+    <string name="racelist_finishing">Zieleinlauf</string>
     <string name="racelist_finished">Beendet</string>
     <string name="racelist_unknown">Unknown</string>
     <string name="currentlyLoading">Lädt &#8230;</string>
@@ -78,7 +78,7 @@
     <string name="gateStart_mode">Gate-Start</string>
     <string name="confirmation_blue_flag_remove">Blaue Flagge wirklich einholen?</string>
     <string name="confirmation_blue_flag_display">Blaue Flagge wirklich anzeigen?</string>
-    <string name="confirmation_first_substitute_display">Rückruf wirklich anzeigen?</string>
+    <string name="confirmation_first_substitute_display">Gesamtrückruf wirklich anzeigen?</string>
     <string name="finishing_limit_template">Zeitlimit endet um %s</string>
     <string name="race_running_since_template" formatted="false">%s läuft seit %s</string>
     <string name="race_reset_confirmation_header">Zurücksetzen des Rennens</string>
@@ -92,12 +92,12 @@
     <string name="race_startphase_countdown_mode_remove">%1$s bis Flagge %2$s eingeholt wird</string>
     <string name="race_startphase_countdown_mode_display">%1$s bis Flagge %2$s angezeigt wird</string>
     <string name="race_startphase_ess_countdown_ap_flag_removed">%1$s bis Flagge AP eingeholt wird</string>
-    <string name="race_startphase_ess_countdown_one_flag_display">%1$s bis Flagge One eingeholt wird</string>
-    <string name="race_startphase_ess_countdown_two_flag_display">%1$s bis Flagge Two eingeholt wird</string>
-    <string name="race_startphase_ess_countdown_three_flag_display">%1$s bis Flagge Three eingeholt wird</string>
-    <string name="race_startphase_countdown_class_remove">%1$s bis Flagge %2$s eingeholt wird (Rennstart)</string>
-    <string name="race_startphase_ess_countdown_one_flag_remove">%1$s bis Flagge One eingeholt wird (Rennstart)</string>
-    <string name="race_startphase_countdown_class_display">%1$s bis Flagge %2$s angezeigt wird</string>
+    <string name="race_startphase_ess_countdown_one_flag_display">%1$s bis Flagge Eins eingeholt wird</string>
+    <string name="race_startphase_ess_countdown_two_flag_display">%1$s bis Flagge Zwei eingeholt wird</string>
+    <string name="race_startphase_ess_countdown_three_flag_display">%1$s bis Flagge Drei eingeholt wird</string>
+    <string name="race_startphase_countdown_class_remove">%1$s bis Klassenflagge %2$s eingeholt wird (Rennstart)</string>
+    <string name="race_startphase_ess_countdown_one_flag_remove">%1$s bis Flagge Eins eingeholt wird (Rennstart)</string>
+    <string name="race_startphase_countdown_class_display">%1$s bis Klassenflagge %2$s angezeigt wird</string>
     <string name="race_startphase_countdown_start">%1$s bis %2$s startet&quot;</string>
     <string name="race_startphase_gate_class_over_golf_display">%1$s bis die Klassenflagge über Golf angezeigt wird</string>
     <string name="race_startphase_gate_class_removed">%1$s bis die Klassenflagge eingeholt wird (Rennstart)</string>
@@ -125,11 +125,11 @@
     <string name="course_design_dialog_title">Kursdesign erstellen</string>
     <string name="pick_a_rounding_direction">Wenderichtung auswählen</string>
     <string name="change_course_element">Wegpunkt ändern</string>
-    <string name="select_penalty_reason">Penalty auswählen</string>
+    <string name="select_penalty_reason">Strafe auswählen</string>
 
     <string-array name="rounding_directions">
-        <item>Port</item>
-        <item>Starboard</item>
+        <item>Backbord</item>
+        <item>Steuerbord</item>
         <item>Gate</item>
     </string-array>
     <string-array name="course_element_changers">
@@ -147,6 +147,8 @@
     <string name="yes">Ja</string>
     <string name="no">Nein</string>
     <string name="positionings">Ergebnisliste</string>
+    <string name="set_positionings">Ergebnisliste füllen</string>
+    <string name="confirm_positionings">Ergebnisliste bestätigen</string>
     <string name="availableFinishingCompetitors">Segler</string>
     <string name="choose_blue_flag_finishing">Rennen beenden</string>
     <string name="drag_handle_description">Cursor</string>
@@ -174,8 +176,8 @@
     <string name="in_knots">in Knoten</string>
     <string name="latitude">Latitude</string>
     <string name="longitude">Longitude</string>
-    <string name="wind_speed_direction_not_a_valid_number">The wind speed or direction is not a valid number. Please correct the value.</string>
-    <string name="wind_location_or_fields_not_valid">The entered location, wind speed or direction is empty. Please correct the values.</string>
+    <string name="wind_speed_direction_not_a_valid_number">Die Windgeschwindigkeit oder -richtung ist keine valide Zahl. Bitte korrigieren Sie den Wert.</string>
+    <string name="wind_location_or_fields_not_valid">Die eingegebene Position, Windgeschwindigkeit oder -richtung ist leer. Bitte korrigieren Sie die Werte.</string>
     <string name="your_position">Aktuelle Position</string>
     <string name="store_wind_entry">4. Windeingaben speichern</string>
     <string name="store_wind">Windeingaben speichern</string>
@@ -198,9 +200,9 @@
     <string name="settings_advanced_service_description">Webservice URL einstellen.</string>
     <string name="settings_advanced_mail_description">Empfänger für Bilder der Ergebnislisten.</string>
     <string name="settings_advanced_mail_header">Empfänger Ergebnislisten</string>
-    <string name="settings_advanced_max_rounds_description">Wählen sie die maximale Rundenanzahl aus.</string>
+    <string name="settings_advanced_max_rounds_description">Wählen Sie die maximale Rundenanzahl aus.</string>
     <string name="settings_advanced_max_rounds_header">Maximale Rundenanzahl pro Kurs</string>
-    <string name="settings_advanced_min_rounds_description">Wählen sie die minimale Rundenanzahl aus.</string>
+    <string name="settings_advanced_min_rounds_description">Wählen Sie die minimale Rundenanzahl aus.</string>
     <string name="settings_advanced_min_rounds_header">Minimale Rundenanzahl pro Kurs</string>
     <!-- SETTINGS -->
     
@@ -229,5 +231,6 @@
 	
 	<string name="nationality">Nationalität</string>
 	<string name="number">Nummer</string>
+	<string name="snap">Fotos schießen</string>
 	
 </resources>

mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml

@@ -257,5 +257,8 @@
 	
 	<string name="nationality">Nationality</string>
 	<string name="number">Number</string>
+	<string name="set_positionings">Set positionings</string>
+	<string name="confirm_positionings">Confirm positionings</string>
+	<string name="snap">Snap</string>
 	
 </resources>

mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/startprocedure/impl/RRS26StartProcedure.java

@@ -323,27 +323,27 @@ public class RRS26StartProcedure implements StartProcedure, StartModeChoosableSt
     @Override
     public Pair<String, List<Object>> getNextFlagCountdownUiLabel(Context context, long millisecondsTillStart) {
         Pair<String, List<Object>> result;
-        List<Object> milisecondsList = new ArrayList<Object>();
+        List<Object> millisecondsList = new ArrayList<Object>();
         if (millisecondsTillStart < startPhaseStartModeDownInterval) {
-            milisecondsList.add(millisecondsTillStart);
-            milisecondsList.add(this.boatClassName);
+            millisecondsList.add(millisecondsTillStart);
+            millisecondsList.add(this.boatClassName);
             result = new Pair<String, List<Object>>(context.getResources().getString(
-                    R.string.race_startphase_countdown_class_remove), milisecondsList);
+                    R.string.race_startphase_countdown_class_remove), millisecondsList);
         } else if (millisecondsTillStart < startPhaseStartModeUpInterval) {
-            milisecondsList.add(millisecondsTillStart - startPhaseStartModeDownInterval);
-            milisecondsList.add(this.startModeFlag.toString());
+            millisecondsList.add(millisecondsTillStart - startPhaseStartModeDownInterval);
+            millisecondsList.add(this.startModeFlag.toString());
             result = new Pair<String, List<Object>>(context.getResources().getString(
-                    R.string.race_startphase_countdown_mode_remove), milisecondsList);
+                    R.string.race_startphase_countdown_mode_remove), millisecondsList);
         } else if (millisecondsTillStart < startPhaseClassUpInterval) {
-            milisecondsList.add(millisecondsTillStart - startPhaseStartModeUpInterval);
-            milisecondsList.add(this.startModeFlag.toString());
+            millisecondsList.add(millisecondsTillStart - startPhaseStartModeUpInterval);
+            millisecondsList.add(this.startModeFlag.toString());
             result = new Pair<String, List<Object>>(context.getResources().getString(
-                    R.string.race_startphase_countdown_mode_display), milisecondsList);
+                    R.string.race_startphase_countdown_mode_display), millisecondsList);
         } else {
-            milisecondsList.add(millisecondsTillStart - startPhaseClassUpInterval);
-            milisecondsList.add(this.boatClassName);
+            millisecondsList.add(millisecondsTillStart - startPhaseClassUpInterval);
+            millisecondsList.add(this.boatClassName);
             result = new Pair<String, List<Object>>(context.getResources().getString(
-                    R.string.race_startphase_countdown_class_display), milisecondsList);
+                    R.string.race_startphase_countdown_class_display), millisecondsList);
         }
         return result;
     }

mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/ESSCourseDesignDialogFragment.java

@@ -451,8 +451,9 @@ public class ESSCourseDesignDialogFragment extends RaceDialogFragment {
         builder.setTitle(R.string.pick_a_rounding_direction)
         .setItems(R.array.rounding_directions, new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialog, int position) {
-                String[] directions = getActivity().getResources().getStringArray(R.array.rounding_directions);
-                RoundingDirection pickedDirection = RoundingDirection.valueOf(directions[position]);
+                // for i18n we expect following order in array: 1. Port, 2. Starboard, 3. Gate
+                //String[] directions = getActivity().getResources().getStringArray(R.array.rounding_directions);
+                RoundingDirection pickedDirection = RoundingDirection.relevantValues()[position];
                 onRoundingDirectionPicked(courseElement, pickedDirection);
             }
         });

mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/PositioningFragment.java

@@ -62,7 +62,7 @@ public class PositioningFragment extends RaceDialogFragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         if (isDialog()) {
-            getDialog().setTitle("Set positionings");
+            getDialog().setTitle(R.string.set_positionings);
         }
         return inflater.inflate(R.layout.race_positioning_view, container, false);
     }

mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/SetStartTimeRaceFragment.java

@@ -156,6 +156,7 @@ public class SetStartTimeRaceFragment extends RaceFragment implements UserRequir
             }
         });
 
+        //TODO read the preferences from AppPreferences
         StartProcedureType type = StartProcedureType.ESS;
         boolean overrideStartProcedureType = PreferenceManager.getDefaultSharedPreferences(getActivity()).getBoolean(
                 "overrideDefaultStartProcedureType", false);

mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/startphase/RRS26StartPhaseFragment.java

@@ -178,6 +178,8 @@ public class RRS26StartPhaseFragment extends RaceFragment implements RRS26StartP
     }
 
     private void setNextFlagCountdownLabel(long millisecondsTillStart) {
+        //TODO This method needs to be reviewed and changed. Why List<Object>? Isn't there any more concrete return value type than Object?
+        //Furthermore the Flag name is not shown correctly
         Pair<String, List<Object>> countdownStringPackage = getRace().getState().getStartProcedure()
                 .getNextFlagCountdownUiLabel(getActivity(), millisecondsTillStart);
         CharSequence countdownTime = TimeUtils