Skip to content

update Nightscout URL placeholder to Heroku #978

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

Merged
ps2 merged 1 commit into from
Jul 9, 2019
Merged

update Nightscout URL placeholder to Heroku #978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Loop/Base.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
"Glucose Momentum" = "Glucose Momentum";

/* The placeholder text for the nightscout site URL credential */
"https://mysite.azurewebsites.net" = "https://mysite.azurewebsites.net";
"https://mysite.herokuapp.com" = "https://mysite.herokuapp.com";

/* The title of a target alert action specifying an indefinitely long workout targets duration */
"Indefinitely" = "Indefinitely";
Expand Down
2 changes: 1 addition & 1 deletion Loop/Models/ServiceAuthentication/NightscoutService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class NightscoutService: ServiceAuthenticationUI {
credentialFormFields = [
ServiceCredential(
title: NSLocalizedString("Site URL", comment: "The title of the nightscout site URL credential"),
placeholder: NSLocalizedString("https://mysite.azurewebsites.net", comment: "The placeholder text for the nightscout site URL credential"),
placeholder: NSLocalizedString("https://mysite.herokuapp.com", comment: "The placeholder text for the nightscout site URL credential"),
isSecret: false,
keyboardType: .URL
),
Expand Down
2 changes: 1 addition & 1 deletion Loop/de.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
"Glucose Momentum" = "Blutzucker-Momentum";

/* The placeholder text for the nightscout site URL credential */
"https://mysite.azurewebsites.net" = "https://mysite.azurewebsites.net";
"https://mysite.herokuapp.com" = "https://mysite.herokuapp.com";

/* The title of a target alert action specifying an indefinitely long workout targets duration */
"Indefinitely" = "Unendlich";
Expand Down
2 changes: 1 addition & 1 deletion Loop/es.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
"Glucose Momentum" = "Momento de Glucosa";

/* The placeholder text for the nightscout site URL credential */
"https://mysite.azurewebsites.net" = "https://mysite.azurewebsites.net";
"https://mysite.herokuapp.com" = "https://mysite.herokuapp.com";

/* The title of a target alert action specifying an indefinitely long workout targets duration */
"Indefinitely" = "Indefinidamente";
Expand Down
2 changes: 1 addition & 1 deletion Loop/fr.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
"Glucose Momentum" = "Momentum de glucose";

/* The placeholder text for the nightscout site URL credential */
"https://mysite.azurewebsites.net" = "https://mysite.azurewebsites.net";
"https://mysite.herokuapp.com" = "https://mysite.herokuapp.com";

/* The title of a target alert action specifying an indefinitely long workout targets duration */
"Indefinitely" = "Indéfiniment";
Expand Down
2 changes: 1 addition & 1 deletion Loop/it.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
"Glucose Momentum" = "Effetto Glicemico";

/* The placeholder text for the nightscout site URL credential */
"https://mysite.azurewebsites.net" = "https://mysite.azurewebsites.net";
"https://mysite.herokuapp.com" = "https://mysite.herokuapp.com";

/* The title of a target alert action specifying an indefinitely long workout targets duration */
"Indefinitely" = "Per sempre";
Expand Down
2 changes: 1 addition & 1 deletion Loop/nb.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
"Glucose Momentum" = "Glukosemomentum";

/* The placeholder text for the nightscout site URL credential */
"https://mysite.azurewebsites.net" = "https://mysite.azurewebsites.net";
"https://mysite.herokuapp.com" = "https://mysite.herokuapp.com";

/* The title of a target alert action specifying an indefinitely long workout targets duration */
"Indefinitely" = "Uendelig";
Expand Down
2 changes: 1 addition & 1 deletion Loop/nl.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
"Glucose Momentum" = "Glucose momentum";

/* The placeholder text for the nightscout site URL credential */
"https://mysite.azurewebsites.net" = "https://mijnsite.azurewebsites.net";
"https://mysite.herokuapp.com" = "https://mijnsite.herokuapp.com";

/* The title of a target alert action specifying an indefinitely long workout targets duration */
"Indefinitely" = "Oneindig";
Expand Down
2 changes: 1 addition & 1 deletion Loop/pl.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
"Glucose Momentum" = "Pęd glukozy";

/* The placeholder text for the nightscout site URL credential */
"https://mysite.azurewebsites.net" = "https://mysite.azurewebsites.net";
"https://mysite.herokuapp.com" = "https://mysite.herokuapp.com";

/* The title of a target alert action specifying an indefinitely long workout targets duration */
"Indefinitely" = "Niemożliwy do określenia";
Expand Down
2 changes: 1 addition & 1 deletion Loop/ru.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
"Glucose Momentum" = "Динамика гликемии";

/* The placeholder text for the nightscout site URL credential */
"https://mysite.azurewebsites.net" = "https://мойсайт. azurewebsites.net";
"https://mysite.herokuapp.com" = "https://мойсайт. herokuapp.com";

/* The title of a target alert action specifying an indefinitely long workout targets duration */
"Indefinitely" = "На неопределенное время";
Expand Down
2 changes: 1 addition & 1 deletion Loop/zh-Hans.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
"Glucose Momentum" = "葡萄糖增量预测算法";

/* The placeholder text for the nightscout site URL credential */
"https://mysite.azurewebsites.net" = "https://mysite.azurewebsites.net";
"https://mysite.herokuapp.com" = "https://mysite.herokuapp.com";

/* The title of a target alert action specifying an indefinitely long workout targets duration */
"Indefinitely" = "永久";
Expand Down
8 changes: 4 additions & 4 deletions LoopTests/KeychainManagerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ class KeychainManagerTests: XCTestCase {
try manager.setUsernamePasswordURLForLabel(nil, password: nil, url: nil)
XCTAssertNil(manager.getUsernamePasswordURLForLabel())

manager.setNightscoutURL(URL(string: "http://mysite.azurewebsites.net")!, secret: "ABCDEFG")
manager.setNightscoutURL(URL(string: "http://mysite.herokuapp.com")!, secret: "ABCDEFG")
var nightscoutCredentials = manager.getNightscoutCredentials()!
XCTAssertEqual(URL(string: "http://mysite.azurewebsites.net")!, nightscoutCredentials.url)
XCTAssertEqual(URL(string: "http://mysite.herokuapp.com")!, nightscoutCredentials.url)
XCTAssertEqual("ABCDEFG", nightscoutCredentials.secret)

manager.setNightscoutURL(URL(string: "http://mysite.azurewebsites.net:4443")!, secret: "ABCDEFG")
manager.setNightscoutURL(URL(string: "http://mysite.herokuapp.com:4443")!, secret: "ABCDEFG")
nightscoutCredentials = manager.getNightscoutCredentials()!
XCTAssertEqual(URL(string: "http://mysite.azurewebsites.net:4443")!, nightscoutCredentials.url)
XCTAssertEqual(URL(string: "http://mysite.herokuapp.com:4443")!, nightscoutCredentials.url)
XCTAssertEqual("ABCDEFG", nightscoutCredentials.secret)

manager.setNightscoutURL(nil, secret: nil)
Expand Down