Put correct localizations in data

dev
Laurent 7 years ago
parent 07d78776ca
commit ec20235518
  1. 26
      app/src/main/java/net/pokeranalytics/android/model/LiveData.kt
  2. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt
  3. 6
      app/src/main/res/values/strings.xml

@ -71,14 +71,31 @@ enum class LiveData : Localizable {
LOCATION -> R.string.location LOCATION -> R.string.location
TOURNAMENT_NAME -> R.string.tournament_name TOURNAMENT_NAME -> R.string.tournament_name
TOURNAMENT_FEATURE -> R.string.tournament_feature TOURNAMENT_FEATURE -> R.string.tournament_feature
TRANSACTION -> R.string.operations TRANSACTION -> R.string.operation
TRANSACTION_TYPE -> R.string.operation_types TRANSACTION_TYPE -> R.string.operation_types
FILTER -> R.string.filter FILTER -> R.string.filter
CUSTOM_FIELD -> R.string.custom_field
REPORT_SETUP -> R.string.custom
}
}
val pluralResId: Int
get() {
return when (this) {
BANKROLL -> R.string.bankrolls
GAME -> R.string.games
LOCATION -> R.string.locations
TOURNAMENT_NAME -> R.string.tournament_names
TOURNAMENT_FEATURE -> R.string.tournament_features
TRANSACTION -> R.string.operations
TRANSACTION_TYPE -> R.string.operation_types
FILTER -> R.string.filters
CUSTOM_FIELD -> R.string.custom_fields CUSTOM_FIELD -> R.string.custom_fields
REPORT_SETUP -> R.string.custom REPORT_SETUP -> R.string.custom
} }
} }
/** /**
* Return the new entity titleResId * Return the new entity titleResId
*/ */
@ -93,4 +110,11 @@ enum class LiveData : Localizable {
return context.getString(R.string.update_entity, this.localizedTitle(context).toLowerCase()) return context.getString(R.string.update_entity, this.localizedTitle(context).toLowerCase())
} }
/**
* Return the update entity titleResId
*/
fun pluralLocalizedTitle(context: Context): String {
return context.getString(this.pluralResId, context)
}
} }

@ -127,7 +127,7 @@ class DataListFragment : DeletableItemFragment(), LiveRowRepresentableDataSource
this.dataType = LiveData.values()[dataType] this.dataType = LiveData.values()[dataType]
this.identifiableClass = this.dataType.relatedEntity this.identifiableClass = this.dataType.relatedEntity
setToolbarTitle(this.dataType.localizedTitle(requireContext())) setToolbarTitle(this.dataType.pluralLocalizedTitle(requireContext()))
val realm = getRealm() val realm = getRealm()
this.items = realm.sorted(this.identifiableClass) this.items = realm.sorted(this.identifiableClass)

@ -35,6 +35,7 @@
<string name="update_entity" formatted="false">Update %s</string> <string name="update_entity" formatted="false">Update %s</string>
<string name="comparison_chart">Comparison chart</string> <string name="comparison_chart">Comparison chart</string>
<string name="filter_currently_selected">The filter cannot be deleted because it is currently selected.</string> <string name="filter_currently_selected">The filter cannot be deleted because it is currently selected.</string>
<string name="custom_field">Custom field</string>
<string name="address">Address</string> <string name="address">Address</string>
<string name="suggestions">Naming suggestions</string> <string name="suggestions">Naming suggestions</string>
@ -42,7 +43,9 @@
<string name="end_date_not_possible">The end date should be after the start date</string> <string name="end_date_not_possible">The end date should be after the start date</string>
<string name="save">Save</string> <string name="save">Save</string>
<string name="tournament_name">Tournament name</string> <string name="tournament_name">Tournament name</string>
<string name="tournament_names">Tournament names</string>
<string name="tournament_feature">Tournament feature</string> <string name="tournament_feature">Tournament feature</string>
<string name="tournament_features">Tournament features</string>
<string name="pending">Pending</string> <string name="pending">Pending</string>
<string name="disclaimer">Poker Analytics is a poker tracking app. We’re currently on our way to reproduce the iOS app and you’re currently using a lighter version. The app will work with a US$29.99 yearly subscription for an unlimited usage, but will be free until reaching the appropriate feature coverage.</string> <string name="disclaimer">Poker Analytics is a poker tracking app. We’re currently on our way to reproduce the iOS app and you’re currently using a lighter version. The app will work with a US$29.99 yearly subscription for an unlimited usage, but will be free until reaching the appropriate feature coverage.</string>
<string name="iunderstand">I understand</string> <string name="iunderstand">I understand</string>
@ -161,7 +164,7 @@
<string name="current_year">Current year</string> <string name="current_year">Current year</string>
<string name="curve">Curve</string> <string name="curve">Curve</string>
<string name="custom">Custom</string> <string name="custom">Custom</string>
<string name="custom_fields">Custom Fields</string> <string name="custom_fields">Custom fields</string>
<string name="data">Import &amp; Export</string> <string name="data">Import &amp; Export</string>
<string name="data_management">Data management</string> <string name="data_management">Data management</string>
<string name="data_table">Table</string> <string name="data_table">Table</string>
@ -712,6 +715,7 @@
<string name="operation_type_empty_field_error">You need to name the transaction type</string> <string name="operation_type_empty_field_error">You need to name the transaction type</string>
<string name="operation_types">Transaction type</string> <string name="operation_types">Transaction type</string>
<string name="operations">Transactions</string> <string name="operations">Transactions</string>
<string name="operation">Transaction</string>
<string name="add_an_operation">Add a transaction</string> <string name="add_an_operation">Add a transaction</string>
<string name="duplicate_operation_error">An identical transaction already exists</string> <string name="duplicate_operation_error">An identical transaction already exists</string>
<string name="duplicate_operation_type_error">A transaction type with the same name already exists</string> <string name="duplicate_operation_type_error">A transaction type with the same name already exists</string>

Loading…
Cancel
Save