Skip to content
This repository has been archived by the owner on Apr 27, 2020. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronhktan committed Nov 14, 2017
2 parents d1262c7 + 9e6e0db commit 5ff6001
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,5 +112,5 @@
"watchface": false
}
},
"version": "2.50.0"
"version": "2.51.0"
}
4 changes: 2 additions & 2 deletions src/c/localize.c
Original file line number Diff line number Diff line change
Expand Up @@ -1239,9 +1239,9 @@ char* localize_get_credits_row_title() {

char* localize_get_new_version_title() {
if (strncmp(localize_get_locale(), "es", 2) == 0) {
return "¡Versión 2.4!";
return "¡Versión 2.51!";
} else {
return "Version 2.4!";
return "Version 2.51!";
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/c/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ static void inbox_received_handler(DictionaryIterator *iter, void *context) {
}

static void init() {
APP_LOG(APP_LOG_LEVEL_INFO, "You are running version 2.5 of the Breathe app.");
APP_LOG(APP_LOG_LEVEL_INFO, "You are running version 2.51 of the Breathe app.");
// Open AppMessage connection
app_message_register_inbox_received(inbox_received_handler);
app_message_open(256, 256);
Expand All @@ -66,9 +66,9 @@ static void init() {
// Pushes the reminder window stack
reminder_window_push();
// If the user still has reminders enabled, schedule next wakeup
// if (settings_get_reminderHours() != 0) {
// wakeup_schedule_next_wakeup(settings_get_reminderHours(), 0, settings_get_reminderHoursStart());
// }
if (settings_get_reminderHours() != 0) {
wakeup_schedule_next_wakeup(settings_get_reminderHours(), 0, settings_get_reminderHoursStart());
}
} else {
APP_LOG(APP_LOG_LEVEL_DEBUG, "Heap free is %d.", (int)heap_bytes_free());
// reminder_window_push(); // For testing
Expand Down
2 changes: 1 addition & 1 deletion src/c/settings_menu.c
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ static void menu_draw_row_callback(GContext* ctx, const Layer *cell_layer, MenuI
case 5: // This is the about section
switch (cell_index->row) {
case 0: // This is the version number
menu_cell_basic_draw(ctx, cell_layer, localize_get_version_row_title(), "v2.4, 2017-09-01", NULL);
menu_cell_basic_draw(ctx, cell_layer, localize_get_version_row_title(), "v2.51, 2017-11-13", NULL);
break;
case 1: // This is the credits
menu_cell_basic_draw(ctx, cell_layer, localize_get_credits_row_title(), "cheeseisdisgusting", NULL);
Expand Down
2 changes: 1 addition & 1 deletion src/pkjs/config-de.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = [
},
{
"type": "text",
"defaultValue": "Dies sind die Einstellungen für die Breathe-App. Sie benutzen Version 2.5 von Breathe.",
"defaultValue": "Dies sind die Einstellungen für die Breathe-App. Sie benutzen Version 2.51 von Breathe.",
},
{
"type": "section",
Expand Down
2 changes: 1 addition & 1 deletion src/pkjs/config-es.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = [
},
{
"type": "text",
"defaultValue": "Esto es la página de ajustes para la app Breathe. Estás usando la versión 2.5 de la app.",
"defaultValue": "Esta es la página de ajustes para la app Breathe. Estás usando la versión 2.51 de la app.",
},
{
"type": "section",
Expand Down
2 changes: 1 addition & 1 deletion src/pkjs/config-fr.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = [
},
{
"type": "text",
"defaultValue": "Ceci est la page de configuration pour l'app Breathe. Vous utilisez version 2.5 de l'app.",
"defaultValue": "Ceci est la page de configuration pour l'app Breathe. Vous utilisez version 2.51 de l'app.",
},
{
"type": "section",
Expand Down
2 changes: 1 addition & 1 deletion src/pkjs/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = [
},
{
"type": "text",
"defaultValue": "This is the settings page for the Breathe app. You are running version 2.5 of Breathe.",
"defaultValue": "This is the settings page for the Breathe app. You are running version 2.51 of Breathe.",
},
{
"type": "section",
Expand Down

0 comments on commit 5ff6001

Please sign in to comment.