Skip to content

Commit 60b79ff

Browse files
authored
Merge pull request #132 from Zolon-DOL/master
2023 Changes - Sprint 6
2 parents fd066d0 + 536a803 commit 60b79ff

File tree

8 files changed

+4866
-5063
lines changed

8 files changed

+4866
-5063
lines changed

app/src/main/assets/Saint Helena, Ascension, and Tristan da Cunha.pdf renamed to app/src/main/assets/Saint Helena Ascension and Tristan da Cunha.pdf

File renamed without changes.

app/src/main/assets/countries_2021.xml

Lines changed: 3793 additions & 4978 deletions
Large diffs are not rendered by default.

app/src/main/assets/goods_2021.xml

Lines changed: 1071 additions & 83 deletions
Large diffs are not rendered by default.

app/src/main/java/gov/dol/childlabor/AppHelpers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ private static int getReportResourceId(Context context, String name) {
6666

6767
public static String getFormattedString(String string) {
6868
return string.replace(" ", "_").replace("-", "_").replace("/", "_").replace("ô", "o").replace("ã", "a").replace("é", "e").replace("í", "i").replace("ó", "o").replace("á", "a")
69-
.replace("(", "").replace(")", "").replace(",", "").replace("'", "").replace("`", "").replace(".", "").replace("ç", "c").toLowerCase();
69+
.replace("(", "").replace(")", "").replace(",", "").replace("'", "").replace("`", "").replace(".", "").replace("ç", "c").toLowerCase().replace("ü", "u").toLowerCase();
7070
}
7171

7272
public static void trackScreenView(AnalyticsApplication application, String screenName) {

app/src/main/java/gov/dol/childlabor/StatisticsActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class StatisticsActivity extends AppCompatActivity {
2525
protected void onCreate(Bundle savedInstanceState) {
2626
super.onCreate(savedInstanceState);
2727
Country country = (Country) getIntent().getSerializableExtra("country");
28-
String[] MultiText = {"Somalia", "Pakistan","Tanzania"};
28+
String[] MultiText = {};//{"Somalia", "Pakistan","Tanzania"};
2929
// String[] MultiText = {"Pakistan","Tanzania"};
3030

3131

File renamed without changes.
File renamed without changes.
2.07 MB
Loading

0 commit comments

Comments
 (0)