Skip to content
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

fix clash in str_page_info strings.xml #100

Merged
merged 5 commits into from
Jan 21, 2020
Merged

fix clash in str_page_info strings.xml #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
561cb12
fix clash in str_page_info strings.xml
bennsimon Jan 21, 2020
7b28748
updated snapshot version
bennsimon Jan 21, 2020
129c216
Merge branch 'master' into fix-conflict-on-str-page-info
ndegwamartin Jan 21, 2020
ec98297
fix str_page_info translations
bennsimon Jan 21, 2020
e90ff8a
Merge branch 'fix-conflict-on-str-page-info' of github.com:OpenSRP/op…
bennsimon Jan 21, 2020
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
3 changes: 2 additions & 1 deletion opensrp-child/src/main/java/org/smartregister/child/provider/ChildRegisterProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import org.smartregister.view.dialog.SortOption;
import org.smartregister.view.viewholder.OnClickFormLauncher;

import java.text.MessageFormat;
import java.util.Set;

/**
Expand Down Expand Up @@ -103,7 +104,7 @@ public void getView(Cursor cursor, SmartRegisterClient client, RegisterViewHolde
public void getFooterView(RecyclerView.ViewHolder viewHolder, int currentPageCount, int totalPageCount, boolean hasNext,
boolean hasPrevious) {
FooterViewHolder footerViewHolder = (FooterViewHolder) viewHolder;
footerViewHolder.pageInfoView.setText(context.getString(R.string.str_page_info, currentPageCount, totalPageCount));
footerViewHolder.pageInfoView.setText(MessageFormat.format(context.getString(R.string.str_page_info), currentPageCount, totalPageCount));

footerViewHolder.nextPageView.setVisibility(hasNext ? View.VISIBLE : View.INVISIBLE);
footerViewHolder.previousPageView.setVisibility(hasPrevious ? View.VISIBLE : View.INVISIBLE);
Expand Down
4 changes: 2 additions & 2 deletions opensrp-child/src/main/res/values-ar/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,10 +348,10 @@
\nمتأخر</string>

<string name="mother_name">الأم/ الحاضن: %1$s</string>
<string name="str_page_info">%2$s
<string name="str_page_info">{1}
من

%1$s
{0}
صفحة

</string>
Expand Down
2 changes: 1 addition & 1 deletion opensrp-child/src/main/res/values-fr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,5 +346,5 @@
<string name="n_period_overdue">%1$s\nEn retard</string>

<string name="mother_name">M/G: %1$s</string>
<string name="str_page_info">Page %1$s de %2$s</string>
<string name="str_page_info">Page {0} de {1}</string>
</resources>
2 changes: 1 addition & 1 deletion opensrp-child/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,6 @@

<string name="mother_name">M/G: %1$s</string>
<string name="child_name">"B/o %1$s</string>
<string name="str_page_info">Page %1$s of %2$s</string>
<string name="str_page_info">Page {0} of {1}</string>
ndegwamartin marked this conversation as resolved.
Show resolved Hide resolved

</resources>