Skip to content

Fix for No space before number of days and wrong pluralisation logic #17 #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EdgarK wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for No space before number of days and wrong pluralisation logic #17 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fb5f42
Fixing issue #17 No space before number of days and wrong pluralisati…
Apr 27, 2018
e47846d
Making it impossible to use carriage return inside range EditText
Apr 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../src/main/java/com/leavjenn/smoothdaterangepicker/date/SmoothDateRangePickerFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ private void updateDisplay(boolean announce) {
mYearViewEnd.setText(YEAR_FORMAT.format(mCalendarEnd.getTime()));
mDuration = Utils.daysBetween(mCalendar, mCalendarEnd);
mDurationTextView.setText(String.valueOf(mDuration));
mDurationDayTextView.setText(mDuration > 1 ? getString(R.string.days) : getString(R.string.day));
mDurationDayTextView.setText(" " + getResources().getQuantityString(R.plurals.day, mDuration));

// Accessibility.
long millis = mCalendar.getTimeInMillis();
Expand Down
5 changes: 4 additions & 1 deletion library/src/main/res/layout/sdrp_duration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,16 @@
android:textCursorDrawable="@null"
android:visibility="gone"
android:textColor="@color/sdrp_selector"
android:lines="1"
android:maxLines="1"
android:inputType="number"
android:textSize="20sp" />

<TextView
android:id="@+id/tv_duration_day"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/day"
tools:text="0 days"
android:textColor="@color/sdrp_selector"
android:textSize="20sp"
/>
Expand Down
6 changes: 6 additions & 0 deletions library/src/main/res/values-bg/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,10 @@
<string name="mdtp_select_year" msgid="2603330600102539372">"Изберете година"</string>
<string name="mdtp_item_is_selected" msgid="2674929164900463786">"Избрахте <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="mdtp_deleted_key" msgid="6908431551612331381">"Изтрихте <xliff:g id="KEY">%1$s</xliff:g>"</string>

<plurals name="day">
<item quantity="one">ден</item>
<item quantity="many">дни</item>
<item quantity="other">дни</item>
</plurals>
</resources>
8 changes: 6 additions & 2 deletions library/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@
<string name="mdtp_select_year" msgid="2603330600102539372">"Jahr auswählen"</string>
<string name="mdtp_item_is_selected" msgid="2674929164900463786">"<xliff:g id="ITEM">%1$s</xliff:g> ausgewählt"</string>
<string name="mdtp_deleted_key" msgid="6908431551612331381">"<xliff:g id="KEY">%1$s</xliff:g> gelöscht"</string>
<string name="day">\u0020tag</string>
<string name="duration">Dauer:\u0020</string>
<string name="days">\u0020tage</string>

<plurals name="day">
<item quantity="one">tag</item>
<item quantity="many">tage</item>
<item quantity="other">tage</item>
</plurals>
</resources>
7 changes: 5 additions & 2 deletions library/src/main/res/values-en-rGB/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@
<string name="mdtp_select_year" msgid="2603330600102539372">"Select year"</string>
<string name="mdtp_item_is_selected" msgid="2674929164900463786">"<xliff:g id="ITEM">%1$s</xliff:g> selected"</string>
<string name="mdtp_deleted_key" msgid="6908431551612331381">"<xliff:g id="KEY">%1$s</xliff:g> deleted"</string>
<string name="day">\u0020day</string>
<string name="days">\u0020days</string>
<string name="duration">Duration:\u0020</string>
<plurals name="day">
<item quantity="one">day</item>
<item quantity="many">days</item>
<item quantity="other">days</item>
</plurals>
</resources>
7 changes: 5 additions & 2 deletions library/src/main/res/values-en-rIN/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@
<string name="mdtp_select_year" msgid="2603330600102539372">"Select year"</string>
<string name="mdtp_item_is_selected" msgid="2674929164900463786">"<xliff:g id="ITEM">%1$s</xliff:g> selected"</string>
<string name="mdtp_deleted_key" msgid="6908431551612331381">"<xliff:g id="KEY">%1$s</xliff:g> deleted"</string>
<string name="day">\u0020day</string>
<string name="days">\u0020days</string>
<string name="duration">Duration:\u0020</string>
<plurals name="day">
<item quantity="one">day</item>
<item quantity="many">days</item>
<item quantity="other">days</item>
</plurals>
</resources>
8 changes: 6 additions & 2 deletions library/src/main/res/values-es/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
<string name="mdtp_item_is_selected" msgid="2674929164900463786">"<xliff:g id="ITEM">%1$s</xliff:g> seleccionado"</string>
<string name="mdtp_deleted_key" msgid="6908431551612331381">"<xliff:g id="KEY">%1$s</xliff:g> eliminado"</string>
<string name="duration">Duración:\u0020</string>
<string name="days">\u0020dias</string>
<string name="day">\u0020día</string>

<plurals name="day">
<item quantity="one">día</item>
<item quantity="many">días</item>
<item quantity="other">días</item>
</plurals>
</resources>
10 changes: 8 additions & 2 deletions library/src/main/res/values-uk/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
limitations under the License.
-->

<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="mdtp_done_label" msgid="7007948707597430919">"Готово"</string>
<string name="mdtp_hour_picker_description" msgid="7586639618712934060">"Вибір годин на циферблаті"</string>
<string name="mdtp_minute_picker_description" msgid="6024811202872705251">"Вибір хвилин на циферблаті"</string>
Expand All @@ -28,4 +27,11 @@
<string name="mdtp_select_year" msgid="2603330600102539372">"Виберіть рік"</string>
<string name="mdtp_item_is_selected" msgid="2674929164900463786">"Вибрано: <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="mdtp_deleted_key" msgid="6908431551612331381">"<xliff:g id="KEY">%1$s</xliff:g> видалено"</string>

<plurals name="day">
<item quantity="one" tools:ignore="ImpliedQuantity">день</item>
<item quantity="many">днів</item>
<item quantity="other">днів</item>
<item quantity="few">днів</item>
</plurals>
</resources>
6 changes: 4 additions & 2 deletions library/src/main/res/values-zh-rCN/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@
<string name="mdtp_select_year" msgid="2603330600102539372">"选择年份"</string>
<string name="mdtp_item_is_selected" msgid="2674929164900463786">"已选择 <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="mdtp_deleted_key" msgid="6908431551612331381">"已删除 <xliff:g id="KEY">%1$s</xliff:g>"</string>
<string name="day">\u0020日</string>
<string name="days">\u0020日</string>
<string name="duration">持续时间：\u0020</string>

<plurals name="day">
<item quantity="other">日</item>
</plurals>
</resources>
6 changes: 4 additions & 2 deletions library/src/main/res/values-zh-rHK/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@
<string name="mdtp_select_year" msgid="2603330600102539372">"選取年份"</string>
<string name="mdtp_item_is_selected" msgid="2674929164900463786">"已選取<xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="mdtp_deleted_key" msgid="6908431551612331381">"已刪除 <xliff:g id="KEY">%1$s</xliff:g>"</string>
<string name="day">\u0020日</string>
<string name="days">\u0020日</string>
<string name="duration">持續時間：\u0020</string>

<plurals name="day">
<item quantity="other">日</item>
</plurals>
</resources>
6 changes: 4 additions & 2 deletions library/src/main/res/values-zh-rTW/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
<string name="mdtp_item_is_selected" msgid="2674929164900463786">"已選取 <xliff:g id="ITEM">%1$s</xliff:g>"</string>
<string name="mdtp_deleted_key" msgid="6908431551612331381">"已刪除 <xliff:g id="KEY">%1$s</xliff:g>"</string>
<string name="duration">持續時間：\u0020</string>
<string name="day">\u0020日</string>
<string name="days">\u0020日</string>

<plurals name="day">
<item quantity="other">日</item>
</plurals>
</resources>
7 changes: 5 additions & 2 deletions library/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@

<!--Duration text-->
<string name="duration">Duration:\u0020</string>
<string name="day">\u0020day</string>
<string name="days">\u0020days</string>
<plurals name="day">
<item quantity="one">day</item>
<item quantity="many">days</item>
<item quantity="other">days</item>
</plurals>
</resources>