toolshed/abra
4
2
Fork 18
Code Issues 26 Pull Requests 3 Packages Releases 41 Activity

chore: i18n.G, update POT
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
3wc
2025-09-09 17:36:20 -04:00
parent c67fc57902
commit 26c920e570
2 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/deploy/utils.go
View File

@ -28,7 +28,7 @@ func MergeAbraShEnv(recipe recipe.Recipe, env envfile.AppEnv) error {
} }
for k, v := range abraShEnv { 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 env[k] = v
} }
@ -190,13 +190,15 @@ func GatherSecretsForDeploy(cl *dockerClient.Client, app appPkg.App, showUnchang
return nil, err return nil, err
} }
log.Debugf("current secrets: %v", currentSecrets) log.Debugf(i18n.G("current secrets: %v", currentSecrets))
newSecrets, err := secret.PollSecretsStatus(cl, app) newSecrets, err := secret.PollSecretsStatus(cl, app)
if err != nil { if err != nil {
return nil, err return nil, err
} }
log.Debugf(i18n.G("new secrets: %v", newSecrets))
// Sort secrets to ensure reproducible output // Sort secrets to ensure reproducible output
sort.Slice(newSecrets, func(i, j int) bool { sort.Slice(newSecrets, func(i, j int) bool {
return newSecrets[i].LocalName < newSecrets[j].LocalName return newSecrets[i].LocalName < newSecrets[j].LocalName

50
pkg/i18n/locales/abra.pot
View File

@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "Project-Id-Version: \n" msgstr "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: EMAIL\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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -441,7 +441,7 @@ msgstr ""
msgid "%s: %s" msgid "%s: %s"
msgstr "" 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 #, c-format
msgid "%s: %s (new)" msgid "%s: %s (new)"
msgstr "" msgstr ""
@ -451,12 +451,12 @@ msgstr ""
msgid "%s: %s (retries: %v, healthcheck: %s)" msgid "%s: %s (retries: %v, healthcheck: %s)"
msgstr "" 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 #, c-format
msgid "%s: %s (unchanged)" msgid "%s: %s (unchanged)"
msgstr "" 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 #, c-format
msgid "%s: %s → %s" msgid "%s: %s → %s"
msgstr "" msgstr ""
@ -466,7 +466,7 @@ msgstr ""
msgid "%s: %s: %s" msgid "%s: %s: %s"
msgstr "" msgstr ""
#: ./pkg/deploy/utils.go:169 #: ./pkg/deploy/utils.go:245
#, c-format #, c-format
msgid "%s: ? (missing version)" msgid "%s: ? (missing version)"
msgstr "" msgstr ""
@ -1917,9 +1917,9 @@ msgstr ""
msgid "can't copy dir to file" msgid "can't copy dir to file"
msgstr "" msgstr ""
#: ./pkg/client/configs.go:48 #: ./pkg/deploy/utils.go:44
#, c-format #, c-format
msgid "can't parse version from config '%s'" msgid "can't parse version from '%s'"
msgstr "" msgstr ""
#: ./cli/internal/validate.go:35 #: ./cli/internal/validate.go:35
@ -2154,7 +2154,7 @@ msgstr ""
msgid "compose: %s, " msgid "compose: %s, "
msgstr "" msgstr ""
#: ./pkg/client/configs.go:36 #: ./pkg/client/configs.go:35
#, c-format #, c-format
msgid "conf %s: %s" msgid "conf %s: %s"
msgstr "" msgstr ""
@ -2329,6 +2329,11 @@ msgstr ""
msgid "current deployment '%s' is not a known version for %s" msgid "current deployment '%s' is not a known version for %s"
msgstr "" msgstr ""
#: ./pkg/deploy/utils.go:193
#, c-format
msgid "current secrets: %v"
msgstr ""
#: ./cli/recipe/release.go:532 #: ./cli/recipe/release.go:532
#, c-format #, c-format
msgid "current: %s, new: %s, correct?" msgid "current: %s, new: %s, correct?"
@ -2387,12 +2392,12 @@ msgstr ""
msgid "deploy timed out 🟠" msgid "deploy timed out 🟠"
msgstr "" msgstr ""
#: ./pkg/deploy/utils.go:157 #: ./pkg/deploy/utils.go:233
#, c-format #, c-format
msgid "deployed config names: %v" msgid "deployed config names: %v"
msgstr "" msgstr ""
#: ./pkg/deploy/utils.go:196 #: ./pkg/deploy/utils.go:272
#, c-format #, c-format
msgid "deployed images: %v" msgid "deployed images: %v"
msgstr "" msgstr ""
@ -2447,16 +2452,21 @@ msgstr ""
msgid "diff <recipe> [flags]" msgid "diff <recipe> [flags]"
msgstr "" msgstr ""
#: ./pkg/deploy/utils.go:76 #: ./pkg/deploy/utils.go:130
#, c-format #, c-format
msgid "different versions for config '%s', '%s' and %s'" msgid "different versions for config '%s', '%s' and %s'"
msgstr "" msgstr ""
#: ./pkg/deploy/utils.go:123 ./pkg/deploy/utils.go:217 #: ./pkg/deploy/utils.go:177 ./pkg/deploy/utils.go:294
#, c-format #, c-format
msgid "different versions for image '%s', '%s' and %s'" msgid "different versions for image '%s', '%s' and %s'"
msgstr "" msgstr ""
#: ./pkg/deploy/utils.go:84
#, c-format
msgid "different versions for secret '%s', '%s' and %s'"
msgstr ""
#: ./pkg/recipe/recipe.go:202 #: ./pkg/recipe/recipe.go:202
#, c-format #, c-format
msgid "dir: %s, " msgid "dir: %s, "
@ -3641,6 +3651,11 @@ msgstr ""
msgid "new release published: %s" msgid "new release published: %s"
msgstr "" msgstr ""
#: ./pkg/deploy/utils.go:200
#, c-format
msgid "new secrets: %v"
msgstr ""
#: ./pkg/git/read.go:88 #: ./pkg/git/read.go:88
#, c-format #, c-format
msgid "no %s exists, not reading any global gitignore config" msgid "no %s exists, not reading any global gitignore config"
@ -3811,7 +3826,7 @@ msgstr ""
msgid "no version bump type specififed?" msgid "no version bump type specififed?"
msgstr "" msgstr ""
#: ./pkg/deploy/utils.go:168 #: ./pkg/deploy/utils.go:244
#, c-format #, c-format
msgid "no version found for config %s" msgid "no version found for config %s"
msgstr "" msgstr ""
@ -4027,7 +4042,7 @@ msgstr ""
msgid "processing %s for %s" msgid "processing %s for %s"
msgstr "" msgstr ""
#: ./pkg/deploy/utils.go:221 #: ./pkg/deploy/utils.go:298
#, c-format #, c-format
msgid "proposed images: %v" msgid "proposed images: %v"
msgstr "" msgstr ""
@ -4122,6 +4137,11 @@ msgstr ""
msgid "read recipe catalogue from file system cache in %s" msgid "read recipe catalogue from file system cache in %s"
msgstr "" msgstr ""
#: ./pkg/deploy/utils.go:31
#, c-format
msgid "read v:%s k: %s"
msgstr ""
#: ./pkg/ui/deploy.go:86 #: ./pkg/ui/deploy.go:86
#, c-format #, c-format
msgid "reader: %v, " msgid "reader: %v, "
@ -4545,7 +4565,7 @@ msgstr ""
msgid "satisfied" msgid "satisfied"
msgstr "" msgstr ""
#: ./pkg/deploy/utils.go:164 #: ./pkg/deploy/utils.go:240
#, c-format #, c-format
msgid "searching abra.sh for version for %s" msgid "searching abra.sh for version for %s"
msgstr "" msgstr ""