Skip to content

Commit cbe34df

Browse files
committed
Merge remote-tracking branch 'loopkit/dev' into ps2/LOOP-4665/functional-algorithm
2 parents ebc821f + 6873e64 commit cbe34df

File tree

83 files changed

+2278
-3121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+2278
-3121
lines changed

Common/de.lproj/Intents.strings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"lYMuWV" = "Voreinstellungs-Name";
1515

1616
/* (No Comment) */
17-
"nDKAmn" = "Welche Voreinstellung möchten Sie aktivieren?";
17+
"nDKAmn" = "Welche Voreinstellung möchtest Du aktivieren?";
1818

1919
/* (No Comment) */
2020
"OcNxIj" = "KH hinzufügen";

Common/he.lproj/Intents.strings

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
/* (No Comment) */
2-
"9KhaIS" = "I've set the preset";
2+
"9KhaIS" = "ההגדרה נקבעה";
33

44
/* (No Comment) */
5-
"80eo5o" = "Add Carb Entry";
5+
"80eo5o" = "הוסף שורת פחמימות";
66

77
/* (No Comment) */
8-
"b085BW" = "I wasn't able to set the preset.";
8+
"b085BW" = "לא הצלחתי לקבוע את ההגדרה.";
99

1010
/* (No Comment) */
11-
"I4OZy8" = "Enable Override Preset";
11+
"I4OZy8" = "אפשר מעקף מוגדר";
1212

1313
/* (No Comment) */
14-
"lYMuWV" = "Override Name";
14+
"lYMuWV" = "שם המעקף";
1515

1616
/* (No Comment) */
17-
"nDKAmn" = "What's the name of the override you'd like to set?";
17+
"nDKAmn" = "מה שם המעקף שברצונך ליצור?";
1818

1919
/* (No Comment) */
20-
"OcNxIj" = "Add Carb Entry";
20+
"OcNxIj" = "הוסף שורת פחמימות";
2121

2222
/* (No Comment) */
23-
"oLQSsJ" = "Enable '${overrideName}' Override Preset";
23+
"oLQSsJ" = "אפשר מעקף ${overrideName} מוגדר";
2424

2525
/* (No Comment) */
26-
"XNNmtH" = "Enable preset in Loop";
26+
"XNNmtH" = "אפשר את ההגדרה ב-Loop";
2727

2828
/* (No Comment) */
29-
"yBzwCL" = "Override Selection";
29+
"yBzwCL" = "בחירת מעקף";
3030

3131
/* (No Comment) */
32-
"yc02Yq" = "Add a carb entry to Loop";
32+
"yc02Yq" = "הוסף שורת פחמימות ל-Loop";
3333

3434
/* (No Comment) */
35-
"ZZ3mtM" = "Enable an override preset in Loop";
35+
"ZZ3mtM" = "אפשר את המעקף ב-Loop";
3636

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/* Bundle display name */
2+
"CFBundleDisplayName" = "Loop Intent Extension";
3+
4+
/* Bundle name */
5+
"CFBundleName" = "Loop Intent Extension";
6+
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
/* The format string for the app name and version number. (1: bundle name)(2: bundle version) */
2-
"%1$@ v%2$@" = "%1$@ против %2$@";
2+
"%1$@ v%2$@" = "%1$@ версии %2$@";
33

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
/* Bundle display name */
22
"CFBundleDisplayName" = "Loop";
33

4+
/* Bundle name */
5+
"CFBundleName" = "Loop Status Extension";
6+

Loop Status Extension/he.lproj/Localizable.strings

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/* Displayed in the widget when the amount of active carbs cannot be determined. */
2+
"? g" = "? g";
3+
4+
/* Displayed in the widget when the amount of active insulin cannot be determined. */
5+
"? U" = "? U";
6+
7+
/* The subtitle format describing the grams of active carbs. (1: localized carb value description) */
8+
"%1$@" = "%1$@";
9+
10+
/* The subtitle format describing units of active insulin. (1: localized insulin value description) */
11+
"%1$@ U" = "U %1$@";
12+
113
/* The format string for the app name and version number. (1: bundle name)(2: bundle version) */
214
"%1$@ v%2$@" = "%1$@ v%2$@";
315

@@ -11,7 +23,7 @@
1123
"dB" = "dB";
1224

1325
/* The subtitle format describing eventual glucose. (1: localized glucose value description) */
14-
"Eventually %1$@" = "Eventually %1$@";
26+
"Eventually %1$@" = "בדרך ל-%1$@";
1527

1628
/* The short unit display string for grams */
1729
"g" = "g";

Loop Status Extension/he.lproj/MainInterface.strings

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"dPp-lJ-5sh.text" = "0 g";
66

77
/* Class = "UILabel"; text = "Active Insulin"; ObjectID = "UPi-dG-yYD"; */
8-
"UPi-dG-yYD.text" = "Active Insulin";
8+
"UPi-dG-yYD.text" = "אינסולין פעיל";
99

1010
/* Class = "UILabel"; text = "0 U"; ObjectID = "Vgf-p1-2QP"; */
11-
"Vgf-p1-2QP.text" = "0 U";
11+
"Vgf-p1-2QP.text" = "U 0";
1212

Loop Status Extension/ru.lproj/Localizable.strings

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"%1$@" = "%1$@";
99

1010
/* The subtitle format describing units of active insulin. (1: localized insulin value description) */
11-
"%1$@ U" = "%1$@ Ед.";
11+
"%1$@ U" = "%1$@ Ед";
1212

1313
/* The format string for the app name and version number. (1: bundle name)(2: bundle version) */
14-
"%1$@ v%2$@" = "%1$@ против %2$@";
14+
"%1$@ v%2$@" = "%1$@ версии %2$@";
1515

1616
/* Widget label title describing the active carbs */
1717
"Active Carbs" = "Активные углеводы";
@@ -35,7 +35,7 @@
3535
"mg/dL" = "мг/дл";
3636

3737
/* The short unit display string for millimoles of glucose per liter */
38-
"mmol/L" = "mmol/L";
38+
"mmol/L" = "ммоль/л";
3939

4040
/* Format string for combining localized numeric value and unit. (1: numeric value)(2: unit) */
4141
"QUANTITY_VALUE_AND_UNIT" = "%1$@ %2$@";

Loop.xcodeproj/project.pbxproj

Lines changed: 24 additions & 27 deletions
Large diffs are not rendered by default.

Loop/AppDelegate.swift

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, WindowProvider {
2222

2323
setenv("CFNETWORK_DIAGNOSTICS", "3", 1)
2424

25-
loopAppManager.initialize(windowProvider: self, launchOptions: launchOptions)
26-
loopAppManager.launch()
25+
if ProcessInfo.processInfo.environment["XCTestConfigurationFilePath"] == nil {
26+
// Code only executes when not running tests
27+
loopAppManager.initialize(windowProvider: self, launchOptions: launchOptions)
28+
loopAppManager.launch()
29+
}
2730
return loopAppManager.isLaunchComplete
2831
}
2932

@@ -32,7 +35,10 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, WindowProvider {
3235
func applicationDidBecomeActive(_ application: UIApplication) {
3336
log.default(#function)
3437

35-
loopAppManager.didBecomeActive()
38+
if ProcessInfo.processInfo.environment["XCTestConfigurationFilePath"] == nil {
39+
// Code only executes when not running tests
40+
loopAppManager.didBecomeActive()
41+
}
3642
}
3743

3844
func applicationWillResignActive(_ application: UIApplication) {

0 commit comments

Comments
 (0)