From 0dc9a0fe2c22233576477e63f830a9eff9c6ce69 Mon Sep 17 00:00:00 2001 From: Landen Date: Tue, 8 Dec 2015 10:13:48 -0600 Subject: [PATCH 1/3] treatment reminder text for treatment reminders --- config/locales/en/en_base.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/locales/en/en_base.yml b/config/locales/en/en_base.yml index 47b5fd5..9adc08e 100644 --- a/config/locales/en/en_base.yml +++ b/config/locales/en/en_base.yml @@ -222,6 +222,8 @@ en: #alarm alarm_reminder_title: "Reminder" alarm_reminder_text: "Don’t forget to check into Flaredown today!" + treatment_reminder_title: "Treatment Reminder" + treatment_reminder_text: "Don't forget to take " alarm_off_caps: "OFF" # account @@ -920,4 +922,4 @@ en:
Miscellaneous Terms

Flaredown may assign this agreement at any time to a subsidiary or parent company or to a successor to its business as part of a merger or sale of substantially all of its assets. You may not assign or transfer this agreement.

If any provision of this Agreement is held to be unenforceable for any reason, the remaining provisions will be unaffected and remain in full force and effect.

-

For any questions or comments, or to report violations of this agreement, email us at contact@flaredown.com, or contact us at:

Flaredown, LLC
75 E 4th St #4157
New York, NY 10003 \ No newline at end of file +

For any questions or comments, or to report violations of this agreement, email us at contact@flaredown.com, or contact us at:

Flaredown, LLC
75 E 4th St #4157
New York, NY 10003 From 7ee77ee7ab8373c9c99e82ae87f2f5f02d70a119 Mon Sep 17 00:00:00 2001 From: Landen Date: Tue, 8 Dec 2015 11:46:09 -0600 Subject: [PATCH 2/3] Some additional error and form labels api error settings activity section labels spelling correction --- config/locales/en/en_base.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/config/locales/en/en_base.yml b/config/locales/en/en_base.yml index 9adc08e..f56d3dc 100644 --- a/config/locales/en/en_base.yml +++ b/config/locales/en/en_base.yml @@ -56,6 +56,8 @@ en: save: "Save" saving: "Saving..." keep_typing: "Keep typing..." + checkin_reminder_title: "Remind me to check in" + treatment_reminder_title: "Treatment reminders" today: "Today" yesterday: "Yesterday" @@ -389,13 +391,16 @@ en: basic_2: "Fairly active" basic_3: "Very active" basic_4: "Extremely active" - + + confirmation_message: + settings_saved: "Settings saved" + nice_errors: field_required: "%{field} is required" field_invalid: "%{field} is invalid" general_error: "Oops!" - general_error_description: "Something went wrong here, please check all the usually suspects and try again." + general_error_description: "Something went wrong here, please check all the usual suspects and try again." bad_credentials: "Invalid Login Credentials" bad_credentials_description: "Either the email or password you submitted was incorrect." unknown_locale: "Unknown Locale" @@ -412,7 +417,8 @@ en: distant_past_date_description: "You can only check in up to two weeks in the past" no_checkins_before_signup: "Too far back!" no_checkins_before_signup_description: "You can only check in on days after the date you originally signed up" - + api_error: "API Error" + api_error_description: "Error retrieving information from the API. Please check your connection and try again." # Some Rails validations name_exists: "Name already exists" From 6dd3b8e3ecb0a2eeb73ac0f41b511777bc4de91b Mon Sep 17 00:00:00 2001 From: Squiggie Date: Tue, 2 Feb 2016 15:31:53 -0600 Subject: [PATCH 3/3] Update en_base.yml Add minimum client error Add URI information for future links --- config/locales/en/en_base.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/config/locales/en/en_base.yml b/config/locales/en/en_base.yml index f56d3dc..86ff923 100644 --- a/config/locales/en/en_base.yml +++ b/config/locales/en/en_base.yml @@ -50,8 +50,14 @@ en: edit: "Edit" edit_caps: "EDIT" edit_lowercase": "edit" + update: "Update" + update_caps: "UPDATE" + update_lowercase: "update" - + URI: + android_app_uri: "" + ios_app_uri: "" + forms: save: "Save" saving: "Saving..." @@ -419,6 +425,8 @@ en: no_checkins_before_signup_description: "You can only check in on days after the date you originally signed up" api_error: "API Error" api_error_description: "Error retrieving information from the API. Please check your connection and try again." + minimum_client_error: "Update Required" + minimum_client_error_description: "An update to Flaredown is required." # Some Rails validations name_exists: "Name already exists"