Merge branch 'dev' of gitlab.com:stax-river/poker-analytics into dev

app/src/main/java/net/pokeranalytics/android/model/LiveData.kt

@@ -95,12 +95,29 @@ enum class LiveData : Localizable {
 			}
 		}
 
+    private val newResId: Int
+        get() {
+            return when (this) {
+                BANKROLL -> R.string.new_bankroll
+                GAME -> R.string.new_variant
+                LOCATION -> R.string.new_location
+                TOURNAMENT_NAME -> R.string.new_tournament_name
+                TOURNAMENT_FEATURE -> R.string.new_tournament_feature
+                TRANSACTION -> R.string.new_operation
+                TRANSACTION_TYPE -> R.string.new_operation_type
+                FILTER -> R.string.new_filter
+                CUSTOM_FIELD -> R.string.new_custom_field
+                REPORT_SETUP -> R.string.new_report
+            }
+        }
 
-	/**
+
+
+    /**
 	 * Return the new entity titleResId
 	 */
 	fun newEntityLocalizedTitle(context: Context): String {
-		return "${context.getString(R.string.new_str)} ${this.localizedTitle(context).toLowerCase()}"
+		return context.getString(this.newResId)
 	}
 
 	/**

app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/ReportRow.kt

@@ -14,7 +14,7 @@ enum class ReportRow : RowRepresentable {
 	DAY_OF_WEEKS,
 	GENERAL,
 	LOCATIONS,
-	NUMBER_OF_TABLES,
+	//NUMBER_OF_TABLES,
 	TOURNAMENT_TYPES,
 	GAME;
 
@@ -39,7 +39,7 @@ enum class ReportRow : RowRepresentable {
 				DAY_OF_WEEKS -> R.string.day_of_the_week
 				GENERAL -> R.string.general
 				LOCATIONS -> R.string.locations
-				NUMBER_OF_TABLES -> R.string.number_of_tables
+				//NUMBER_OF_TABLES -> R.string.number_of_tables
 				TOURNAMENT_TYPES -> R.string.tournament_type_complete
 				GAME -> R.string.game
 			}
@@ -55,7 +55,7 @@ enum class ReportRow : RowRepresentable {
 				DAY_OF_WEEKS -> listOf(Criteria.DaysOfWeek)
 				GENERAL -> listOf(Criteria.SessionTypes, Criteria.BankrollTypes)
 				LOCATIONS -> listOf(Criteria.Locations)
-				NUMBER_OF_TABLES -> listOf() //TODO
+				//NUMBER_OF_TABLES -> listOf() //TODO
 				TOURNAMENT_TYPES -> listOf(Criteria.TournamentTypes)
 				GAME -> listOf(Criteria.Games)
 			}

app/src/main/res/values-fr/strings.xml

@@ -23,6 +23,11 @@
 	<string name="ordinal_suffix_third">ème</string>
 	<string name="ordinal_suffix_default">ème</string>
 
+	<string name="new_tournament_name">Nouveau nom de tournoi</string>
+	<string name="new_tournament_feature">Nouvelle propriété de tournoi</string>
+	<string name="new_filter">Nouveau filtre</string>
+	<string name="update_entity" formatted="false">Mise-à-jour %s</string>
+
 	<!-- Not translated -->
 	<string name="address">Adresse</string>
 	<string name="suggestions">Suggestions de noms</string>
@@ -31,6 +36,8 @@
 	<string name="save">Sauvegarder</string>
 	<string name="tournament_name">Nom du tournoi</string>
 	<string name="tournament_feature">Propriété de tournoi</string>
+	<string name="tournament_names">Noms de tournoi</string>
+	<string name="tournament_features">Propriétés de tournoi</string>
 	<string name="pending">En attente</string>
 	<string name="disclaimer">Poker Analytics est un tracker de sessions. Il s\'agit pour l\'instant d\'une version allégée de la version iOS existante. Nous allons ajouter les fonctionnalités au fur et à mesure. L\'app fonctionnera avec un abonnement illimité de 29,99€ par an, mais nous la proposons gratuitement en attendant plus de fonctionnalités</string>
 	<string name="iunderstand">C\'est compris !</string>

app/src/main/res/values/strings.xml

@@ -63,6 +63,12 @@
 	<string name="ordinal_suffix_third">rd</string>
 	<string name="ordinal_suffix_default">th</string>
 
+	<string name="new_tournament_name">New tournament name</string>
+	<string name="new_tournament_feature">New tournament feature</string>
+	<string name="new_filter">New filter</string>
+
+
+
 	<!-- Translated -->
 
     <string name="_ago">%s ago</string>