From 26c920e5707754107d951f88df6999e3172f28ee Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Tue, 9 Sep 2025 17:36:20 -0400 Subject: [PATCH] chore: i18n.G, update POT --- pkg/deploy/utils.go | 6 +++-- pkg/i18n/locales/abra.pot | 50 +++++++++++++++++++++++++++------------ 2 files changed, 39 insertions(+), 17 deletions(-) diff --git a/pkg/deploy/utils.go b/pkg/deploy/utils.go index 0fceb13b..e4bf8d2b 100644 --- a/pkg/deploy/utils.go +++ b/pkg/deploy/utils.go @@ -28,7 +28,7 @@ func MergeAbraShEnv(recipe recipe.Recipe, env envfile.AppEnv) error { } for k, v := range abraShEnv { - log.Debugf("read v:%s k: %s", v, k) + log.Debugf(i18n.G("read v:%s k: %s", v, k)) env[k] = v } @@ -190,13 +190,15 @@ func GatherSecretsForDeploy(cl *dockerClient.Client, app appPkg.App, showUnchang return nil, err } - log.Debugf("current secrets: %v", currentSecrets) + log.Debugf(i18n.G("current secrets: %v", currentSecrets)) newSecrets, err := secret.PollSecretsStatus(cl, app) if err != nil { return nil, err } + log.Debugf(i18n.G("new secrets: %v", newSecrets)) + // Sort secrets to ensure reproducible output sort.Slice(newSecrets, func(i, j int) bool { return newSecrets[i].LocalName < newSecrets[j].LocalName diff --git a/pkg/i18n/locales/abra.pot b/pkg/i18n/locales/abra.pot index a37b32f5..8902ee05 100644 --- a/pkg/i18n/locales/abra.pot +++ b/pkg/i18n/locales/abra.pot @@ -7,7 +7,7 @@ msgid "" msgstr "Project-Id-Version: \n" "Report-Msgid-Bugs-To: EMAIL\n" - "POT-Creation-Date: 2025-09-09 15:59-0400\n" + "POT-Creation-Date: 2025-09-09 17:36-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -441,7 +441,7 @@ msgstr "" msgid "%s: %s" msgstr "" -#: ./pkg/deploy/utils.go:182 ./pkg/deploy/utils.go:234 +#: ./pkg/deploy/utils.go:219 ./pkg/deploy/utils.go:258 ./pkg/deploy/utils.go:311 #, c-format msgid "%s: %s (new)" msgstr "" @@ -451,12 +451,12 @@ msgstr "" msgid "%s: %s (retries: %v, healthcheck: %s)" msgstr "" -#: ./pkg/deploy/utils.go:176 ./pkg/deploy/utils.go:228 +#: ./pkg/deploy/utils.go:213 ./pkg/deploy/utils.go:252 ./pkg/deploy/utils.go:305 #, c-format msgid "%s: %s (unchanged)" msgstr "" -#: ./pkg/deploy/utils.go:179 ./pkg/deploy/utils.go:231 +#: ./pkg/deploy/utils.go:216 ./pkg/deploy/utils.go:255 ./pkg/deploy/utils.go:308 #, c-format msgid "%s: %s → %s" msgstr "" @@ -466,7 +466,7 @@ msgstr "" msgid "%s: %s: %s" msgstr "" -#: ./pkg/deploy/utils.go:169 +#: ./pkg/deploy/utils.go:245 #, c-format msgid "%s: ? (missing version)" msgstr "" @@ -1917,9 +1917,9 @@ msgstr "" msgid "can't copy dir to file" msgstr "" -#: ./pkg/client/configs.go:48 +#: ./pkg/deploy/utils.go:44 #, c-format -msgid "can't parse version from config '%s'" +msgid "can't parse version from '%s'" msgstr "" #: ./cli/internal/validate.go:35 @@ -2154,7 +2154,7 @@ msgstr "" msgid "compose: %s, " msgstr "" -#: ./pkg/client/configs.go:36 +#: ./pkg/client/configs.go:35 #, c-format msgid "conf %s: %s" msgstr "" @@ -2329,6 +2329,11 @@ msgstr "" msgid "current deployment '%s' is not a known version for %s" msgstr "" +#: ./pkg/deploy/utils.go:193 +#, c-format +msgid "current secrets: %v" +msgstr "" + #: ./cli/recipe/release.go:532 #, c-format msgid "current: %s, new: %s, correct?" @@ -2387,12 +2392,12 @@ msgstr "" msgid "deploy timed out 🟠" msgstr "" -#: ./pkg/deploy/utils.go:157 +#: ./pkg/deploy/utils.go:233 #, c-format msgid "deployed config names: %v" msgstr "" -#: ./pkg/deploy/utils.go:196 +#: ./pkg/deploy/utils.go:272 #, c-format msgid "deployed images: %v" msgstr "" @@ -2447,16 +2452,21 @@ msgstr "" msgid "diff [flags]" msgstr "" -#: ./pkg/deploy/utils.go:76 +#: ./pkg/deploy/utils.go:130 #, c-format msgid "different versions for config '%s', '%s' and %s'" msgstr "" -#: ./pkg/deploy/utils.go:123 ./pkg/deploy/utils.go:217 +#: ./pkg/deploy/utils.go:177 ./pkg/deploy/utils.go:294 #, c-format msgid "different versions for image '%s', '%s' and %s'" msgstr "" +#: ./pkg/deploy/utils.go:84 +#, c-format +msgid "different versions for secret '%s', '%s' and %s'" +msgstr "" + #: ./pkg/recipe/recipe.go:202 #, c-format msgid "dir: %s, " @@ -3641,6 +3651,11 @@ msgstr "" msgid "new release published: %s" msgstr "" +#: ./pkg/deploy/utils.go:200 +#, c-format +msgid "new secrets: %v" +msgstr "" + #: ./pkg/git/read.go:88 #, c-format msgid "no %s exists, not reading any global gitignore config" @@ -3811,7 +3826,7 @@ msgstr "" msgid "no version bump type specififed?" msgstr "" -#: ./pkg/deploy/utils.go:168 +#: ./pkg/deploy/utils.go:244 #, c-format msgid "no version found for config %s" msgstr "" @@ -4027,7 +4042,7 @@ msgstr "" msgid "processing %s for %s" msgstr "" -#: ./pkg/deploy/utils.go:221 +#: ./pkg/deploy/utils.go:298 #, c-format msgid "proposed images: %v" msgstr "" @@ -4122,6 +4137,11 @@ msgstr "" msgid "read recipe catalogue from file system cache in %s" msgstr "" +#: ./pkg/deploy/utils.go:31 +#, c-format +msgid "read v:%s k: %s" +msgstr "" + #: ./pkg/ui/deploy.go:86 #, c-format msgid "reader: %v, " @@ -4545,7 +4565,7 @@ msgstr "" msgid "satisfied" msgstr "" -#: ./pkg/deploy/utils.go:164 +#: ./pkg/deploy/utils.go:240 #, c-format msgid "searching abra.sh for version for %s" msgstr ""