From 28900d0981332b40dfec1709c1bc0b99418e6371 Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Sat, 20 Feb 2016 18:32:48 -0500 Subject: [PATCH] Internationalize more string --- app/src/main/AndroidManifest.xml | 2 +- .../java/org/isoron/helpers/DateHelper.java | 56 +- .../isoron/uhabits/ReminderAlarmReceiver.java | 8 +- .../uhabits/fragments/EditHabitFragment.java | 4 +- .../uhabits/fragments/ShowHabitFragment.java | 2 +- .../uhabits/views/HabitHistoryView.java | 6 +- app/src/main/res/layout/edit_habit.xml | 2 +- app/src/main/res/menu/list_habits_menu.xml | 2 +- app/src/main/res/values/attrs_dslv.xml | 30 - app/src/main/res/values/dimens.xml | 14 +- app/src/main/res/values/fontawesome.xml | 738 +++++++++--------- app/src/main/res/values/keys.xml | 26 + app/src/main/res/values/strings.xml | 43 +- app/src/main/res/xml/preferences.xml | 20 +- 14 files changed, 469 insertions(+), 484 deletions(-) delete mode 100644 app/src/main/res/values/attrs_dslv.xml create mode 100644 app/src/main/res/values/keys.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index eede3d40b..b18ef6319 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -51,7 +51,7 @@ 18) - { - s.append(df.format(years)); - s.append(" years"); - } - else if (weeks > 6) + for (int i = 0; i < 7; i++) { - s.append(df.format(months)); - s.append(" months"); - } - else if (days > 13) - { - s.append(weeks); - s.append(" weeks"); - } - else if (days > 6) - { - s.append(days); - s.append(" days"); - } - else - { - if (days == 0) s.append("Today"); - else if (days == 1 && negative) s.append("Yesterday"); - else if (days == 1 && !negative) s.append("Tomorrow"); - else - { - if (negative) s.append("past "); - s.append(new SimpleDateFormat("EEEE").format(to)); - } + wdays[i] = day.getDisplayName(GregorianCalendar.DAY_OF_WEEK, GregorianCalendar.SHORT, + Locale.getDefault()); + day.add(GregorianCalendar.DAY_OF_MONTH, 1); } - if (negative && days > 6) s.append(" ago"); - - return s.toString(); + return wdays; } + } diff --git a/app/src/main/java/org/isoron/uhabits/ReminderAlarmReceiver.java b/app/src/main/java/org/isoron/uhabits/ReminderAlarmReceiver.java index 72ed45004..2cdfbe33d 100644 --- a/app/src/main/java/org/isoron/uhabits/ReminderAlarmReceiver.java +++ b/app/src/main/java/org/isoron/uhabits/ReminderAlarmReceiver.java @@ -30,7 +30,6 @@ import android.media.RingtoneManager; import android.net.Uri; import android.preference.PreferenceManager; import android.support.v4.app.NotificationCompat; -import android.util.Log; import org.isoron.uhabits.helpers.ReminderHelper; import org.isoron.uhabits.models.Habit; @@ -106,7 +105,6 @@ public class ReminderAlarmReceiver extends BroadcastReceiver if (habit.hasImplicitRepToday()) return; - Log.d("Alarm", String.format("Applying highlight: %s", habit.name)); habit.highlight = 1; habit.save(); @@ -144,8 +142,10 @@ public class ReminderAlarmReceiver extends BroadcastReceiver .setContentText(habit.description) .setContentIntent(contentPendingIntent) .setDeleteIntent(deletePendingIntent) - .addAction(R.drawable.ic_action_check, "Check", checkIntentPending) - .addAction(R.drawable.ic_action_snooze, "Later", snoozeIntentPending) + .addAction(R.drawable.ic_action_check, + context.getString(R.string.check), checkIntentPending) + .addAction(R.drawable.ic_action_snooze, + context.getString(R.string.snooze), snoozeIntentPending) .setSound(soundUri) .extend(wearableExtender) .build(); diff --git a/app/src/main/java/org/isoron/uhabits/fragments/EditHabitFragment.java b/app/src/main/java/org/isoron/uhabits/fragments/EditHabitFragment.java index 1a84d3368..5b61b1fae 100644 --- a/app/src/main/java/org/isoron/uhabits/fragments/EditHabitFragment.java +++ b/app/src/main/java/org/isoron/uhabits/fragments/EditHabitFragment.java @@ -105,7 +105,7 @@ public class EditHabitFragment extends DialogFragment implements OnClickListener if (mode == CREATE_MODE) { - getDialog().setTitle("Create habit"); + getDialog().setTitle(R.string.create_habit); modifiedHabit = new Habit(); int defaultNum = prefs.getInt("pref_default_habit_freq_num", modifiedHabit.freqNum); @@ -121,7 +121,7 @@ public class EditHabitFragment extends DialogFragment implements OnClickListener originalHabit = Habit.get((Long) args.get("habitId")); modifiedHabit = new Habit(originalHabit); - getDialog().setTitle("Edit habit"); + getDialog().setTitle(R.string.edit_habit); tvName.append(modifiedHabit.name); tvDescription.append(modifiedHabit.description); } diff --git a/app/src/main/java/org/isoron/uhabits/fragments/ShowHabitFragment.java b/app/src/main/java/org/isoron/uhabits/fragments/ShowHabitFragment.java index 75ff6b0ff..90b586163 100644 --- a/app/src/main/java/org/isoron/uhabits/fragments/ShowHabitFragment.java +++ b/app/src/main/java/org/isoron/uhabits/fragments/ShowHabitFragment.java @@ -79,7 +79,7 @@ public class ShowHabitFragment extends Fragment implements DialogHelper.OnSavedL LinearLayout llOverview = (LinearLayout) view.findViewById(R.id.llOverview); llOverview.addView(new RingView(activity, (int) activity.getResources().getDimension(R.dimen.small_square_size) * 4, - habit.color, ((float) habit.getScore() / Habit.MAX_SCORE), "Habit strength")); + habit.color, ((float) habit.getScore() / Habit.MAX_SCORE), activity.getString(R.string.habit_strength))); LinearLayout llStrength = (LinearLayout) view.findViewById(R.id.llStrength); llStrength.addView(new HabitScoreView(activity, habit, diff --git a/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java b/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java index 6b0c4e8c2..f4eaa0cfb 100644 --- a/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java +++ b/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java @@ -50,6 +50,8 @@ public class HabitHistoryView extends View private int colorPrimary, colorPrimaryBrighter, grey; private Float prevX, prevY; + private String wdays[]; + public HabitHistoryView(Context context, Habit habit, int squareSize) { super(context); @@ -76,6 +78,8 @@ public class HabitHistoryView extends View pSquareFg.setAntiAlias(true); pSquareFg.setTextSize(squareSize * 0.5f); pSquareFg.setTextAlign(Align.CENTER); + + wdays = DateHelper.getShortDayNames(); } @Override @@ -193,8 +197,6 @@ public class HabitHistoryView extends View square.offset(squareSize, -8 * squareSize); } - String wdays[] = {"Sat", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri"}; - for (int i = 0; i < 7; i++) { square.offset(0, squareSize); diff --git a/app/src/main/res/layout/edit_habit.xml b/app/src/main/res/layout/edit_habit.xml index d3b3a9460..ea2e98cf0 100644 --- a/app/src/main/res/layout/edit_habit.xml +++ b/app/src/main/res/layout/edit_habit.xml @@ -15,7 +15,7 @@ diff --git a/app/src/main/res/menu/list_habits_menu.xml b/app/src/main/res/menu/list_habits_menu.xml index 31da9fa25..408bae45e 100644 --- a/app/src/main/res/menu/list_habits_menu.xml +++ b/app/src/main/res/menu/list_habits_menu.xml @@ -3,7 +3,7 @@ tools:context="org.isoron.uhabits.MainActivity" > diff --git a/app/src/main/res/values/attrs_dslv.xml b/app/src/main/res/values/attrs_dslv.xml deleted file mode 100644 index 3858b7bb8..000000000 --- a/app/src/main/res/values/attrs_dslv.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index f052192f2..f7640173b 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -5,12 +5,12 @@ 42dp - 15 minutes - 30 minutes - 1 hour - 2 hours - 4 hours - 8 hours + @string/interval_15_minutes + @string/interval_30_minutes + @string/interval_1_hour + @string/interval_2_hour + @string/interval_4_hour + @string/interval_8_hour @@ -22,5 +22,5 @@ 480 - 15 minutes + 15 \ No newline at end of file diff --git a/app/src/main/res/values/fontawesome.xml b/app/src/main/res/values/fontawesome.xml index 3f2ae523d..8b20b647d 100644 --- a/app/src/main/res/values/fontawesome.xml +++ b/app/src/main/res/values/fontawesome.xml @@ -1,372 +1,372 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml new file mode 100644 index 000000000..ffd9e1279 --- /dev/null +++ b/app/src/main/res/values/keys.xml @@ -0,0 +1,26 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6f3d09261..13a58218a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -10,8 +10,7 @@ Unarchive Add habit Select a Color - Color %1$d - Color %1$d selected + Habit created. Habit deleted. Nothing to undo. @@ -22,6 +21,9 @@ Habit archived. Habit unarchived. + Color %1$d + Color %1$d selected + Done Clear @@ -40,20 +42,14 @@ sans-serif sans-serif sans-serif - - - - - - - Hello world! + Overview Habit strength History Clear Description - Question (Did you ... today?) + Question (Did you … today?) Repeat times every days @@ -67,10 +63,14 @@ Name cannot be blank. Number must be positive. You can have at most one repetition per day + Create habit + Edit habit + Check + Later Welcome - Loop helps you create and maintain good habits. + Loop Habit Tracker helps you create and maintain good habits. Create some new habits Every day, after performing your habit, put a checkmark on the app. @@ -80,4 +80,25 @@ Track your progress Detailed graphs show you how your habits improved over time. + + 15 minutes + 30 minutes + 1 hour + 2 hours + 4 hours + 8 hours + Toggle repetitions with short press + More convenient, but might cause accidental toggles. + Snooze interval on reminders + Rate this app in Google Play + Send feedback to developer + View source code at GitHub + View app introduction + Links + Behavior + Name + Show archived + Settings + Snooze interval + \ No newline at end of file diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index eb3cabc62..46c72b646 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -3,49 +3,49 @@ + android:title="@string/behavior"> + android:summary="@string/pref_toggle_description" + android:title="@string/pref_toggle_title"/> + android:title="@string/pref_snooze_interval_title"/> + android:title="@string/links"> - + - + - + - +