Translations import from Lokalise

ps2 · ps2 · commit d97b137854f5 · 2023-03-18T16:23:34.000-05:00
diff --git a/AmplitudeService b/AmplitudeService
@@ -1 +1 @@
-Subproject commit 2ee3b253fd240475010f45281e21439ca0f695a6
+Subproject commit 67d850fce3b10bf6d44be7579d1fafb4bf8fd7bf
diff --git a/CGMBLEKit b/CGMBLEKit
@@ -1 +1 @@
-Subproject commit 99dc051affd5cec5e31471491b5857d51699d740
+Subproject commit 924a1652b2076b470c5e0237423f2c14732a8217
diff --git a/G7SensorKit b/G7SensorKit
@@ -1 +1 @@
-Subproject commit 711988d3c6a759a6535166fc492db4ec47e80ff4
+Subproject commit 7354b64927c3bc5c3297e9dc6281e18d33809077
diff --git a/LogglyService b/LogglyService
@@ -1 +1 @@
-Subproject commit 11c9875e6298253e974d3caf0fd5d53b1efad024
+Subproject commit 1aadd223e4f0fec58d1c3e0a37fb558f333d44b9
diff --git a/Loop b/Loop
@@ -1 +1 @@
-Subproject commit 4469d3bb2601fb4f2d4d69d8b1cba287987c6682
+Subproject commit 6e992c2da0f48717f2da81c76d0ce9101d0b6ceb
diff --git a/LoopKit b/LoopKit
@@ -1 +1 @@
-Subproject commit 6073eb1f4adaaeeb449589c21f251db2138b2c89
+Subproject commit 19c5d85b1e92b1f16a164dd551b2d19a051cac89
diff --git a/LoopOnboarding b/LoopOnboarding
@@ -1 +1 @@
-Subproject commit 23e40a2576ca60bb378ecadaf0e481c019d22aec
+Subproject commit 22e3b162a8115950f8d9286b9b90ecca76330f66
diff --git a/LoopSupport b/LoopSupport
@@ -1 +1 @@
-Subproject commit a3e89c0f5ed958f5ee76d655cb10a65de2d23a54
+Subproject commit a700f47fa16b0a09f139bf2e9cb8c3c9a62d191a
diff --git a/NightscoutAPIClient b/NightscoutAPIClient
@@ -1 +1 @@
-Subproject commit 7a05935f958887c938cef8d99ff94865d5daa2b5
+Subproject commit 2f07382484ab7183c1e648aa3d35b3144176fdc8
diff --git a/NightscoutService b/NightscoutService
@@ -1 +1 @@
-Subproject commit 19daa23fa411f542bfe48d7566997c027883b70b
+Subproject commit 1847ac11778dbfe92c5e9bc4bf42b71b30092d1f
diff --git a/OmniBLE b/OmniBLE
@@ -1 +1 @@
-Subproject commit 41bd40f4f0a074e60e0f9a763358a99519e43dcb
+Subproject commit c50506c1a31d5bca2f648a3f011877b830afd52d
diff --git a/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/Contents.json b/OverrideAssetsWatchApp.xcassets/AppIcon.appiconset/Contents.json
@@ -75,6 +75,13 @@
       "size" : "51x51",
       "subtype" : "45mm"
     },
+    {
+      "idiom" : "watch",
+      "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "54x54",
+      "subtype" : "49mm"
+    },
     {
       "filename" : "icon_86pt@2x.png",
       "idiom" : "watch",
@@ -106,6 +113,13 @@
       "size" : "117x117",
       "subtype" : "45mm"
     },
+    {
+      "idiom" : "watch",
+      "role" : "quickLook",
+      "scale" : "2x",
+      "size" : "129x129",
+      "subtype" : "49mm"
+    },
     {
       "filename" : "Icon.png",
       "idiom" : "watch-marketing",
diff --git a/Scripts/import_localizations.sh b/Scripts/import_localizations.sh
@@ -14,6 +14,7 @@ set -u
 date=`date`
 
 # Fetch translations from Lokalise
+rm -rf xliff
 lokalise2 \
     --token "$LOKALISE_TOKEN" \
     --project-id "8069387863cdd837d11dd0.82955128" \
@@ -25,32 +26,52 @@ lokalise2 \
     --replace-breaks=false \
     --unzip-to ./xliff
 
+projects=(LoopKit:AmplitudeService:dev LoopKit:CGMBLEKit:dev LoopKit:G7SensorKit:main LoopKit:LogglyService:dev LoopKit:Loop:dev LoopKit:LoopKit:dev LoopKit:LoopOnboarding:dev LoopKit:LoopSupport:dev LoopKit:NightscoutAPIClient:master ps2:NightscoutService:dev LoopKit:OmniBLE:dev LoopKit:TidepoolKit:dev LoopKit:TidepoolService:dev LoopKit:dexcom-share-client-swift:dev ps2:rileylink_ios:dev)
+
+for project in ${projects}; do
+  echo "Prepping $project"
+  IFS=":" read user dir branch <<< "$project"
+  echo "parts = $user $dir $branch"
+  cd $dir
+  git checkout $branch
+  git branch -D translations || true
+  cd -
+done
 
 # Build Loop
-set -o pipefail && time xcodebuild -workspace Loop.xcworkspace -scheme 'Loop (Workspace)' build | xcpretty
+set -o pipefail && time xcodebuild -workspace LoopWorkspace.xcworkspace -scheme 'LoopWorkspace' build | xcpretty
 
 
 # Apply translations
 foreach file in xliff/*.xliff
-  xcodebuild -workspace Loop.xcworkspace -scheme "Loop (Workspace)" -importLocalizations -localizationPath $file
+  xcodebuild -workspace LoopWorkspace.xcworkspace -scheme "LoopWorkspace" -importLocalizations -localizationPath $file
 end
 
 
 # Generate branches, commit and push.
-projects=(LoopKit:AmplitudeService:dev LoopKit:CGMBLEKit:dev LoopKit:G7SensorKit:main LoopKit:LogglyService:dev LoopKit:Loop:dev LoopKit:LoopKit:dev LoopKit:LoopOnboarding:dev LoopKit:LoopSupport:dev LoopKit:NightscoutAPIClient:master ps2:NightscoutService:dev LoopKit:OmniBLE:dev LoopKit:TidepoolKit:dev LoopKit:TidepoolService:dev LoopKit:dexcom-share-client-swift:dev ps2:rileylink_ios:dev)
 for project in ${projects}; do
-  echo "Working on $project"
+  echo "Commiting $project"
   IFS=":" read user dir branch <<< "$project"
   echo "parts = $user $dir $branch"
   cd $dir
-  set +e
-  git checkout -b translations
+  git checkout -b translations || true
   git add .
-  git commit -am "Updated translations from Lokalise on ${date}"
-  git push -f
-  pr=$(gh pr create -B $branch -R $user/$dir --fill 2>&1 | grep http)
-  echo "PR = $pr"
-  open $pr
-  cd ..
+  if git commit -am "Updated translations from Lokalise on ${date}"; then
+    git push -f
+    pr=$(gh pr create -B $branch -R $user/$dir --fill 2>&1 | grep http)
+    echo "PR = $pr"
+    open $pr
+  fi
+  cd -
 done
 
+# Reset 
+#for project in ${projects}; do
+#  echo "Commiting $project"
+#  IFS=":" read user dir branch <<< "$project"
+#  echo "parts = $user $dir $branch"
+#  cd $dir
+#  git checkout $branch
+#  git pull
+#  cd -
+#done
diff --git a/TidepoolKit b/TidepoolKit
@@ -1 +1 @@
-Subproject commit 5ec8e04e1b8e8c14bf7237a96d86d87863b61f6d
+Subproject commit f74b1f52ebf2171911835b4cf555137794d4ea9a
diff --git a/TidepoolService b/TidepoolService
@@ -1 +1 @@
-Subproject commit f31f5153479839533e40a5e3fc17bab87ba6f4f1
+Subproject commit 52dfdbb647e030134633b04e20ea40d27d00c467
diff --git a/dexcom-share-client-swift b/dexcom-share-client-swift
@@ -1 +1 @@
-Subproject commit 7a0e3e92ed2485f6bf7eda97421a442484e056cd
+Subproject commit 7c19349823fe6249e4a45a690bb63d2d5b6f21f1
diff --git a/rileylink_ios b/rileylink_ios
@@ -1 +1 @@
-Subproject commit 8a68c41e2ce05e47e1a5707d0c4ad05309bd3861
+Subproject commit 9d82f3e449632f7a0e81a72d3d4e298b880fb14c
