diff --git a/app/build.gradle b/app/build.gradle
index 94d1ba86..ed3e2383 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -108,8 +108,6 @@ dependencies {
// CSV Parser: https://mvnrepository.com/artifact/org.apache.commons/commons-csv
implementation 'org.apache.commons:commons-csv:1.6'
- implementation "com.ibm.icu:icu4j:53.1"
-
// Instrumented Tests
androidTestImplementation 'androidx.test:core:1.1.0'
androidTestImplementation 'androidx.test:runner:1.1.1'
diff --git a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt
index 402c343c..9a13f72a 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt
@@ -1,7 +1,6 @@
package net.pokeranalytics.android.model.filter
import android.content.Context
-import com.ibm.icu.text.RuleBasedNumberFormat
import io.realm.Realm
import io.realm.RealmQuery
import io.realm.RealmResults
@@ -427,10 +426,15 @@ sealed class QueryCondition : FilterElementRow {
this.listOfValues = arrayListOf(finalPosition)
}
- override fun labelForValue(value: Int, context: Context): String {
- val nf = RuleBasedNumberFormat(Locale.getDefault(), RuleBasedNumberFormat.ORDINAL)
- return nf.format(value) + " " + context.getString(R.string.position)
- }
+ override fun labelForValue(value: Int, context: Context): String {
+ val suffix = when (value%10) {
+ 1 -> context.getString(R.string.ordinal_suffix_first)
+ 2 -> context.getString(R.string.ordinal_suffix_second)
+ 3 -> context.getString(R.string.ordinal_suffix_third)
+ else -> context.getString(R.string.ordinal_suffix_default)
+ }
+ return "$value$suffix "+context.getString(R.string.position)
+ }
override fun entityName(context: Context): String {
return ""
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt
index 0b63c3ee..a672e2c3 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt
@@ -6,13 +6,13 @@ import android.view.LayoutInflater
import android.view.View
import android.view.inputmethod.EditorInfo
import androidx.core.widget.addTextChangedListener
-import com.ibm.icu.text.NumberFormat
import kotlinx.android.synthetic.main.bottom_sheet_sum.*
import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.*
import net.pokeranalytics.android.R
import net.pokeranalytics.android.exceptions.RowRepresentableEditDescriptorException
import net.pokeranalytics.android.util.extensions.round
import net.pokeranalytics.android.util.extensions.toCurrency
+import java.text.NumberFormat
class BottomSheetSumFragment : BottomSheetFragment() {
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 33452198..6f35506e 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -18,6 +18,10 @@
À partir de
Jusqu\'à
+ ère
+ ème
+ ème
+ ème
Adresse
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 309edcec..a647dc4c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -58,7 +58,10 @@
From
To
-
+ st
+ nd
+ rd
+ th