Skip to content

Migrate pumpmanagers out #45

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
merged 6 commits into from
Mar 20, 2023
Merged

Migrate pumpmanagers out #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4788747
Migrate OmniKit and MinimedKit out into their own repos
ps2 Mar 20, 2023
db18b85
Update scripts with new repos
ps2 Mar 20, 2023
914382e
Separate in/out xliff directories, and do not convert placeholders on…
ps2 Mar 20, 2023
1f08601
Do not convert placeholders on upload
ps2 Mar 20, 2023
40ce835
Fix missing cs locale during export
ps2 Mar 20, 2023
5ffed7b
Update submodules to latest
ps2 Mar 20, 2023
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
6 changes: 6 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,9 @@
[submodule "TidepoolKit"]
path = TidepoolKit
url = https://github.com/LoopKit/TidepoolKit.git
[submodule "OmniKit"]
path = OmniKit
url = https://github.com/LoopKit/OmniKit.git
[submodule "MinimedKit"]
path = MinimedKit
url = https://github.com/LoopKit/MinimedKit.git
2 changes: 1 addition & 1 deletion AmplitudeService
Open in desktop
Submodule AmplitudeService updated 1 files
+3 −0 AmplitudeServiceKitUI/zh-Hans.lproj/Localizable.strings
2 changes: 1 addition & 1 deletion CGMBLEKit
Open in desktop
Submodule CGMBLEKit updated 3 files
+0 −3 CGMBLEKit/cs.lproj/Localizable.strings
+1 −1 CGMBLEKit/he.lproj/Localizable.strings
+0 −3 CGMBLEKit/hi.lproj/Localizable.strings
2 changes: 1 addition & 1 deletion G7SensorKit
Open in desktop
Submodule G7SensorKit updated 4 files
+2 −0 G7SensorKit.xcodeproj/project.pbxproj
+9 −0 G7SensorKitUI/zh-Hans.lproj/Localizable.strings
+0 −3 cs.lproj/Localizable.strings
+0 −3 hi.lproj/Localizable.strings
2 changes: 1 addition & 1 deletion LogglyService
Open in desktop
Submodule LogglyService updated 1 files
+3 −0 LogglyServiceKitUI/zh-Hans.lproj/Localizable.strings
2 changes: 1 addition & 1 deletion Loop
Open in desktop
Submodule Loop updated 10 files
+21 −9 Common/cs.lproj/Intents.strings
+1 −1 Loop/Views/AlertManagementView.swift
+3 −0 Loop/ar.lproj/Localizable.strings
+2 −2 Loop/nb.lproj/Localizable.strings
+6 −0 Loop/nl.lproj/Localizable.strings
+9 −3 Loop/pl.lproj/Localizable.strings
+6 −0 Loop/ro.lproj/Localizable.strings
+15 −2 Loop/zh-Hans.lproj/Localizable.strings
+3 −0 WatchApp Extension/ar.lproj/Localizable.strings
+9 −0 WatchApp Extension/zh-Hans.lproj/Localizable.strings
2 changes: 1 addition & 1 deletion LoopKit
Open in desktop
Submodule LoopKit updated 47 files
+6 −0 LoopKit Example/ar.lproj/Localizable.strings
+3 −3 LoopKit Example/zh-Hans.lproj/Localizable.strings
+2 −0 LoopKit.xcodeproj/project.pbxproj
+3 −0 LoopKit/Resources/fi.lproj/Localizable.strings
+3 −0 LoopKit/Resources/he.lproj/Localizable.strings
+3 −0 LoopKit/Resources/ja.lproj/Localizable.strings
+3 −0 LoopKit/Resources/pt-BR.lproj/Localizable.strings
+1 −1 LoopKit/Resources/ro.lproj/Localizable.strings
+3 −0 LoopKit/Resources/sk.lproj/Localizable.strings
+3 −0 LoopKit/Resources/sv.lproj/Localizable.strings
+3 −0 LoopKit/Resources/vi.lproj/Localizable.strings
+12 −0 LoopKit/Resources/zh-Hans.lproj/Localizable.strings
+3 −0 LoopKitUI/Resources/ar.lproj/Localizable.strings
+1 −1 LoopKitUI/Resources/da.lproj/Localizable.strings
+2 −2 LoopKitUI/Resources/de.lproj/Localizable.strings
+1 −1 LoopKitUI/Resources/es.lproj/Localizable.strings
+4 −1 LoopKitUI/Resources/fi.lproj/Localizable.strings
+6 −0 LoopKitUI/Resources/he.lproj/Localizable.strings
+1 −1 LoopKitUI/Resources/it.lproj/Localizable.strings
+4 −1 LoopKitUI/Resources/ja.lproj/Localizable.strings
+14 −2 LoopKitUI/Resources/nb.lproj/Localizable.strings
+25 −1 LoopKitUI/Resources/nl.lproj/Localizable.strings
+1 −1 LoopKitUI/Resources/pl.lproj/LegacyInsulinDeliveryTableViewController.strings
+9 −6 LoopKitUI/Resources/pl.lproj/Localizable.strings
+3 −0 LoopKitUI/Resources/pt-BR.lproj/Localizable.strings
+25 −1 LoopKitUI/Resources/ro.lproj/Localizable.strings
+2 −2 LoopKitUI/Resources/ru.lproj/Localizable.strings
+12 −0 LoopKitUI/Resources/sk.lproj/Localizable.strings
+5 −2 LoopKitUI/Resources/sv.lproj/Localizable.strings
+4 −1 LoopKitUI/Resources/vi.lproj/Localizable.strings
+1 −1 LoopKitUI/Resources/zh-Hans.lproj/InsulinKit.strings
+2 −2 LoopKitUI/Resources/zh-Hans.lproj/LegacyInsulinDeliveryTableViewController.strings
+22 −1 LoopKitUI/Resources/zh-Hans.lproj/Localizable.strings
+1 −1 MockKit/Resources/nb.lproj/Localizable.strings
+2 −5 MockKit/Resources/zh-Hans.lproj/Localizable.strings
+3 −0 MockKitUI/Resources/ar.lproj/Localizable.strings
+3 −0 MockKitUI/Resources/fi.lproj/Localizable.strings
+3 −0 MockKitUI/Resources/he.lproj/Localizable.strings
+3 −0 MockKitUI/Resources/ja.lproj/Localizable.strings
+1 −1 MockKitUI/Resources/nb.lproj/Localizable.strings
+6 −0 MockKitUI/Resources/nl.lproj/Localizable.strings
+3 −0 MockKitUI/Resources/pt-BR.lproj/Localizable.strings
+7 −1 MockKitUI/Resources/ro.lproj/Localizable.strings
+6 −0 MockKitUI/Resources/sk.lproj/Localizable.strings
+3 −0 MockKitUI/Resources/sv.lproj/Localizable.strings
+3 −0 MockKitUI/Resources/vi.lproj/Localizable.strings
+15 −0 MockKitUI/Resources/zh-Hans.lproj/Localizable.strings
2 changes: 1 addition & 1 deletion LoopSupport
Open in desktop
Submodule LoopSupport updated 1 files
+1 −1 LoopSupportKitUI/zh-Hans.lproj/Localizable.strings
6 changes: 6 additions & 0 deletions LoopWorkspace.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 30 additions & 30 deletions LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C136AA5D231187B0008A320D"
BuildableName = "MinimedKitPlugin.loopplugin"
BlueprintName = "MinimedKitPlugin"
ReferencedContainer = "container:rileylink_ios/RileyLink.xcodeproj">
BlueprintIdentifier = "A99C713023396CB100AB9035"
BuildableName = "NightscoutServiceKitPlugin.loopplugin"
BlueprintName = "NightscoutServiceKitPlugin"
ReferencedContainer = "container:NightscoutService/NightscoutService.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
Expand All @@ -154,10 +154,10 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A99C713023396CB100AB9035"
BuildableName = "NightscoutServiceKitPlugin.loopplugin"
BlueprintName = "NightscoutServiceKitPlugin"
ReferencedContainer = "container:NightscoutService/NightscoutService.xcodeproj">
BlueprintIdentifier = "C1E34B5A29C7AD01009A50A5"
BuildableName = "MinimedKitPlugin.loopplugin"
BlueprintName = "MinimedKitPlugin"
ReferencedContainer = "container:MinimedKit/MinimedKit.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
Expand All @@ -168,10 +168,10 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C136AA2923116E32008A320D"
BlueprintIdentifier = "C124021629C7D93D00B32844"
BuildableName = "OmniKitPlugin.loopplugin"
BlueprintName = "OmniKitPlugin"
ReferencedContainer = "container:rileylink_ios/RileyLink.xcodeproj">
ReferencedContainer = "container:OmniKit/OmniKit.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
Expand Down Expand Up @@ -425,16 +425,6 @@
ReferencedContainer = "container:LoopKit/LoopKit.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C10D9BC91C8269D500378342"
BuildableName = "MinimedKitTests.xctest"
BlueprintName = "MinimedKitTests"
ReferencedContainer = "container:rileylink_ios/RileyLink.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
Expand Down Expand Up @@ -485,16 +475,6 @@
ReferencedContainer = "container:LoopKit/LoopKit.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C1FFAF7F213323CC00C50C1D"
BuildableName = "OmniKitTests.xctest"
BlueprintName = "OmniKitTests"
ReferencedContainer = "container:rileylink_ios/RileyLink.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
Expand Down Expand Up @@ -535,6 +515,26 @@
ReferencedContainer = "container:G7SensorKit/G7SensorKit.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C13CC34029C7B73A007F25DE"
BuildableName = "MinimedKitTests.xctest"
BlueprintName = "MinimedKitTests"
ReferencedContainer = "container:MinimedKit/MinimedKit.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C12ED9C929C7DBA900435701"
BuildableName = "OmniKitTests.xctest"
BlueprintName = "OmniKitTests"
ReferencedContainer = "container:OmniKit/OmniKit.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
Expand Down
1 change: 1 addition & 0 deletions MinimedKit
Open in desktop
Submodule MinimedKit added at 3ede47
2 changes: 1 addition & 1 deletion NightscoutAPIClient
Open in desktop
Submodule NightscoutAPIClient updated from 1e2b1f to 68178a
2 changes: 1 addition & 1 deletion NightscoutService
Open in desktop
Submodule NightscoutService updated 1 files
+6 −0 NightscoutServiceKitUI/zh-Hans.lproj/Localizable.strings
2 changes: 1 addition & 1 deletion OmniBLE
Open in desktop
Submodule OmniBLE updated 5 files
+2 −0 OmniBLE.xcodeproj/project.pbxproj
+4 −0 OmniBLE/ar.lproj/Localizable.strings
+3 −3 OmniBLE/nb.lproj/Localizable.strings
+2 −2 OmniBLE/pl.lproj/Localizable.strings
+73 −1 OmniBLE/zh-Hans.lproj/Localizable.strings
1 change: 1 addition & 0 deletions OmniKit
Open in desktop
Submodule OmniKit added at b35b29
11 changes: 6 additions & 5 deletions Scripts/export_localizations.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,26 @@ set -u

: "$LOKALISE_TOKEN"

LANGUAGES=(ar es ru en zh-Hans nl fr de it nb pl ru es ja pt-BR vi da sv fi ro tr he sk)
LANGUAGES=(ar cs ru en zh-Hans nl fr de it nb pl ru es ja pt-BR vi da sv fi ro tr he sk)

argstring="${LANGUAGES[@]/#/-exportLanguage }"
IFS=" "; args=( $=argstring )

xcodebuild -scheme LoopWorkspace -exportLocalizations -localizationPath xclocs $args

mkdir -p xliff
find xclocs -name '*.xliff' -exec cp {} xliff \;
mkdir -p xliff_out
find xclocs -name '*.xliff' -exec cp {} xliff_out \;

cd xliff
cd xliff_out

foreach lang in $LANGUAGES

lang_iso=$(sed "s/zh-Hans/zh_Hans/g; s/pt-BR/pt_BR/g" <<<"$lang")

lokalise2 \
--token $LOKALISE_TOKEN \
--project-id 8069387863cdd837d11dd0.82955128 \
--convert-placeholders=false \
--project-id 414338966417c70d7055e2.75119857 \
file upload \
--file ${lang}.xliff \
--cleanup-mode \
Expand Down
11 changes: 6 additions & 5 deletions Scripts/import_localizations.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,20 @@ set -u
date=`date`

# Fetch translations from Lokalise
rm -rf xliff
rm -rf xliff_in
lokalise2 \
--token "$LOKALISE_TOKEN" \
--project-id "8069387863cdd837d11dd0.82955128" \
--project-id "414338966417c70d7055e2.75119857" \
file download \
--format xliff \
--bundle-structure "%LANG_ISO%.%FORMAT%" \
--original-filenames=false \
--placeholder-format ios \
--export-empty-as skip \
--replace-breaks=false \
--unzip-to ./xliff
--unzip-to ./xliff_in

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)
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 LoopKit:OmniKit:main LoopKit:MinimedKit:main)

for project in ${projects}; do
echo "Prepping $project"
Expand All @@ -43,7 +44,7 @@ set -o pipefail && time xcodebuild -workspace LoopWorkspace.xcworkspace -scheme


# Apply translations
foreach file in xliff/*.xliff
foreach file in xliff_in/*.xliff
xcodebuild -workspace LoopWorkspace.xcworkspace -scheme "LoopWorkspace" -importLocalizations -localizationPath $file
end

Expand Down
6 changes: 3 additions & 3 deletions Scripts/update_submodule_refs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/bin/zsh

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)
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 LoopKit:OmniKit:main LoopKit:MinimedKit:main)

for project in ${projects}; do
echo "Prepping $project"
echo "Updating to $project"
IFS=":" read user dir branch <<< "$project"
echo "parts = $user $dir $branch"
echo "Updating to $branch on $user/$project"
cd $dir
git checkout $branch
git pull
Expand Down
2 changes: 1 addition & 1 deletion TidepoolKit
Open in desktop
Submodule TidepoolKit updated 2 files
+3 −0 TidepoolKit Example/zh-Hans.lproj/Localizable.strings
+3 −0 TidepoolKit.xcodeproj/project.pbxproj
2 changes: 1 addition & 1 deletion rileylink_ios
Open in desktop
Submodule rileylink_ios updated 600 files