Skip to content

Commit

Permalink
fix: Add missing strings
Browse files Browse the repository at this point in the history
  • Loading branch information
@matbme
matbme committed May 25, 2024
1 parent 88a4f67 commit 1ce846f
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 40 deletions.
42 changes: 21 additions & 21 deletions cmd/pkgManagers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ func updatePkgManager(cmd *cobra.Command, args []string) error {

if name == "" {
if len(args) != 1 || args[0] == "" {
cmdr.Error.Println(apx.Trans("pkgmanagers.new.error.noName"))
cmdr.Error.Println(apx.Trans("pkgmanagers.update.error.noName"))
return nil
}

Expand All @@ -677,130 +677,130 @@ func updatePkgManager(cmd *cobra.Command, args []string) error {

if autoRemove == "" {
if !assumeYes {
cmdr.Info.Printfln(apx.Trans("pkgmanagers.new.info.askAutoRemove"), pkgmanager.CmdAutoRemove)
cmdr.Info.Printfln(apx.Trans("pkgmanagers.update.info.askNewCommand"), "autoRemove", pkgmanager.CmdAutoRemove)
fmt.Scanln(&autoRemove)
if autoRemove == "" {
autoRemove = pkgmanager.CmdAutoRemove
}
} else {
cmdr.Error.Println(apx.Trans("pkgmanagers.new.error.noAutoRemove"))
cmdr.Error.Println(apx.Trans("pkgmanagers.update.error.missingCommand"), "autoRemove")
return nil
}
}

if clean == "" {
if !assumeYes {
cmdr.Info.Printfln(apx.Trans("pkgmanagers.new.info.askClean"), pkgmanager.CmdClean)
cmdr.Info.Printfln(apx.Trans("pkgmanagers.update.info.askNewCommand"), "clean", pkgmanager.CmdClean)
fmt.Scanln(&clean)
if clean == "" {
clean = pkgmanager.CmdClean
}
} else {
cmdr.Error.Println(apx.Trans("pkgmanagers.new.error.noClean"))
cmdr.Error.Println(apx.Trans("pkgmanagers.update.error.missingCommand"), "clean")
return nil
}
}

if install == "" {
if !assumeYes {
cmdr.Info.Printfln(apx.Trans("pkgmanagers.new.info.askInstall"), pkgmanager.CmdInstall)
cmdr.Info.Printfln(apx.Trans("pkgmanagers.update.info.askNewCommand"), "install", pkgmanager.CmdInstall)
fmt.Scanln(&install)
if install == "" {
install = pkgmanager.CmdInstall
}
} else {
cmdr.Error.Println(apx.Trans("pkgmanagers.new.error.noInstall"))
cmdr.Error.Println(apx.Trans("pkgmanagers.update.error.missingCommand"), "install")
return nil
}
}

if list == "" {
if !assumeYes {
cmdr.Info.Printfln(apx.Trans("pkgmanagers.new.info.askList"), pkgmanager.CmdList)
cmdr.Info.Printfln(apx.Trans("pkgmanagers.update.info.askNewCommand"), "list", pkgmanager.CmdList)
fmt.Scanln(&list)
if list == "" {
list = pkgmanager.CmdList
}
} else {
cmdr.Error.Println(apx.Trans("pkgmanagers.new.error.noList"))
cmdr.Error.Println(apx.Trans("pkgmanagers.update.error.missingCommand"), "list")
return nil
}
}

if purge == "" {
if !assumeYes {
cmdr.Info.Printfln(apx.Trans("pkgmanagers.new.info.askPurge"), pkgmanager.CmdPurge)
cmdr.Info.Printfln(apx.Trans("pkgmanagers.update.info.askNewCommand"), "purge", pkgmanager.CmdPurge)
fmt.Scanln(&purge)
if purge == "" {
purge = pkgmanager.CmdPurge
}
} else {
cmdr.Error.Println(apx.Trans("pkgmanagers.new.error.noPurge"))
cmdr.Error.Println(apx.Trans("pkgmanagers.update.error.missingCommand"), "purge")
return nil
}
}

if remove == "" {
if !assumeYes {
cmdr.Info.Printfln(apx.Trans("pkgmanagers.new.info.askRemove"), pkgmanager.CmdRemove)
cmdr.Info.Printfln(apx.Trans("pkgmanagers.update.info.askNewCommand"), "remove", pkgmanager.CmdRemove)
fmt.Scanln(&remove)
if remove == "" {
remove = pkgmanager.CmdRemove
}
} else {
cmdr.Error.Println(apx.Trans("pkgmanagers.new.error.noRemove"))
cmdr.Error.Println(apx.Trans("pkgmanagers.update.error.missingCommand"), "remove")
return nil
}
}

if search == "" {
if !assumeYes {
cmdr.Info.Printfln(apx.Trans("pkgmanagers.new.info.askSearch"), pkgmanager.CmdSearch)
cmdr.Info.Printfln(apx.Trans("pkgmanagers.update.info.askNewCommand"), "search", pkgmanager.CmdSearch)
fmt.Scanln(&search)
if search == "" {
search = pkgmanager.CmdSearch
}
} else {
cmdr.Error.Println(apx.Trans("pkgmanagers.new.error.noSearch"))
cmdr.Error.Println(apx.Trans("pkgmanagers.update.error.missingCommand"), "search")
return nil
}
}

if show == "" {
if !assumeYes {
cmdr.Info.Printfln(apx.Trans("pkgmanagers.new.info.askShow"), pkgmanager.CmdShow)
cmdr.Info.Printfln(apx.Trans("pkgmanagers.update.info.askNewCommand"), "show", pkgmanager.CmdShow)
fmt.Scanln(&show)
if show == "" {
show = pkgmanager.CmdShow
}
} else {
cmdr.Error.Println(apx.Trans("pkgmanagers.new.error.noShow"))
cmdr.Error.Println(apx.Trans("pkgmanagers.update.error.missingCommand"), "show")
return nil
}
}

if update == "" {
if !assumeYes {
cmdr.Info.Printfln(apx.Trans("pkgmanagers.new.info.askUpdate"), pkgmanager.CmdUpdate)
cmdr.Info.Printfln(apx.Trans("pkgmanagers.update.info.askNewCommand"), "update", pkgmanager.CmdUpdate)
fmt.Scanln(&update)
if update == "" {
update = pkgmanager.CmdUpdate
}
} else {
cmdr.Error.Println(apx.Trans("pkgmanagers.new.error.noUpdate"))
cmdr.Error.Println(apx.Trans("pkgmanagers.update.error.missingCommand"), "update")
return nil
}
}

if upgrade == "" {
if !assumeYes {
cmdr.Info.Printfln(apx.Trans("pkgmanagers.new.info.askUpgrade"), pkgmanager.CmdUpgrade)
cmdr.Info.Printfln(apx.Trans("pkgmanagers.update.info.askNewCommand"), "upgrade", pkgmanager.CmdUpgrade)
fmt.Scanln(&upgrade)
if upgrade == "" {
upgrade = pkgmanager.CmdUpgrade
}
} else {
cmdr.Error.Println(apx.Trans("pkgmanagers.new.error.noUpgrade"))
cmdr.Error.Println(apx.Trans("pkgmanagers.update.error.missingCommand"), "upgrade")
return nil
}
}
Expand Down
8 changes: 4 additions & 4 deletions cmd/runtime.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,15 +184,15 @@ func NewRuntimeCommands() []*cmdr.Command {

startCmd := cmdr.NewCommand(
"start",
apx.Trans("subsystems.start.description"),
apx.Trans("subsystems.start.description"),
apx.Trans("runtimeCommand.start.description"),
apx.Trans("runtimeCommand.start.description"),
handleFunc(subSystem, runPkgCmd),
)

stopCmd := cmdr.NewCommand(
"stop",
apx.Trans("subsystems.stop.description"),
apx.Trans("subsystems.stop.description"),
apx.Trans("runtimeCommand.stop.description"),
apx.Trans("runtimeCommand.stop.description"),
handleFunc(subSystem, runPkgCmd),
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/stacks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ func listStacks(cmd *cobra.Command, args []string) error {
if !jsonFlag {
stacksCount := len(stacks)
if stacksCount == 0 {
fmt.Println(apx.Trans("stacks.list.noStacks"))
fmt.Println(apx.Trans("stacks.list.info.noStacks"))
return nil
}

Expand Down Expand Up @@ -442,7 +442,7 @@ func updateStack(cmd *cobra.Command, args []string) error {
packagesArray := strings.Fields(packages)
if len(packages) == 0 && !assumeYes {
if len(stack.Packages) == 0 {
cmdr.Info.Println(apx.Trans("stacks.install.info.noPackages") + "[y/N]")
cmdr.Info.Println(apx.Trans("stacks.update.info.noPackages") + "[y/N]")
} else {
cmdr.Info.Println(apx.Trans("stacks.update.info.confirmPackages"), strings.Join(stack.Packages, "\n\t - "))
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/subsyStems.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ func rmSubSystem(cmd *cobra.Command, args []string) error {
}

if !forceFlag {
cmdr.Info.Printfln(apx.Trans("subsystems.rm.info.askConfirmation"), subSystemName)
cmdr.Info.Printfln(apx.Trans("subsystems.rm.info.askConfirmation")+` [y/N]`, subSystemName)
var confirmation string
fmt.Scanln(&confirmation)
if strings.ToLower(confirmation) != "y" {
Expand Down Expand Up @@ -303,7 +303,7 @@ func resetSubSystem(cmd *cobra.Command, args []string) error {
forceFlag, _ := cmd.Flags().GetBool("force")

if !forceFlag {
cmdr.Info.Printfln(apx.Trans("subsystems.reset.info.askConfirmation"), subSystemName)
cmdr.Info.Printfln(apx.Trans("subsystems.reset.info.askConfirmation")+` [y/N]`, subSystemName)
var confirmation string
fmt.Scanln(&confirmation)
if strings.ToLower(confirmation) != "y" {
Expand Down
28 changes: 17 additions & 11 deletions locales/en.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ runtimeCommand:
description: "Update the list of available packages."
upgrade:
description: "Upgrade all installed packages."
run:
description: "Run command inside subsystem."
enter:
description: "Enter the subsystem's environment."
export:
Expand Down Expand Up @@ -93,7 +95,6 @@ pkgmanagers:
labels:
name: "Name"
builtIn: "Built-in"

list:
description: "List all available package managers."
info:
Expand All @@ -107,7 +108,7 @@ pkgmanagers:
description: "Show information about the specified package manager."
new:
description: "Create a new package manager."

success: "Package manager %s created successfully."
error:
emptyName: "The name cannot be empty."
noName: "No name specified."
Expand All @@ -120,7 +121,6 @@ pkgmanagers:
askCommand: "Enter the command for '%s':"
askOverwrite: "A package manager with the name '%s' already exists. Overwrite
it?"
success: "Created package manager '%s'."
options:
assumeYes:
description: "Assume yes to all prompts."
Expand Down Expand Up @@ -152,14 +152,17 @@ pkgmanagers:
description: "Update the specified package manager."
info:
success: "Updated package manager '%s'."
askNewCommand: "Enter new command for '%s' (leave empty to keep '%s'):"
error:
noName: "No name specified."
missingCommand: "Missing command for %s."
rm:
description: "Remove the specified package manager."

error:
noName: "No name specified."
inUse: "The package manager is used in %d stacks:"
info:
askConfirmation: "Are you sure you want to remove '%s'? [y/N]"
askConfirmation: "Are you sure you want to remove '%s'?"
success: "Removed package manager '%s'."
aborting: "Aborting removal of package manager '%s'."
options:
Expand Down Expand Up @@ -195,7 +198,6 @@ stacks:
labels:
name: "Name"
builtIn: "Built-in"

list:
description: "List all available stacks."
info:
Expand All @@ -217,6 +219,8 @@ stacks:
noBase: "No base specified."
emptyPkgManager: "The package manager cannot be empty."
noPkgManager: "No package manager specified."
noPkgManagers: "Could not find any package managers. Create
one with 'apx pkgmanagers new' or contact the system administrator."
pkgManagerDoesNotExist: "The specified package manager does not exist. Create
it with 'apx pkgmanagers new' or contact the system administrator."
emptyPackages: "The packages cannot be empty."
Expand All @@ -227,7 +231,7 @@ stacks:
askBase: "Choose a base (e.g. 'vanillaos/pico'):"
askPkgManager: "Choose a package manager:"
selectPkgManager: "Select a package manager [1-%d]:"
noPackages: "You have not provided any package to install in the stack. Do you
noPackages: "You have not provided any packages to install in the stack. Do you
want to add some now?"
confirmPackages: "Do you want to confirm the current packages list?"
askPackages: "Please type the packages you want to install in the stack, separated
Expand Down Expand Up @@ -255,10 +259,12 @@ stacks:
info:
askBase: "Type a new base or confirm the current one (%s):"
askPkgManager: "Choose a new package manager or confirm the current one (%s):"
confirmPackages: "Do you want to confirm the current packages list?"
noPackages: "You have not provided any packages to install in the stack. Do you
want to add some now?"
askPackages: "Type the packages you want to install in the stack, separated
by a space, or confirm the current ones (%s):"
success: "Updated stack '%s'."

options:
assumeYes:
description: "Assume yes to all prompts."
Expand All @@ -275,7 +281,7 @@ stacks:
error:
noName: "No name specified."
info:
askConfirmation: "Are you sure you want to remove '%s'? [y/N]"
askConfirmation: "Are you sure you want to remove '%s'?"
success: "Removed stack '%s'."
options:
force:
Expand Down Expand Up @@ -353,7 +359,7 @@ subsystems:
error:
noName: "No name specified."
info:
askConfirmation: "Are you sure you want to remove '%s'? [y/N]"
askConfirmation: "Are you sure you want to remove '%s'?"
success: "Removed subsystem '%s'."
options:
force:
Expand All @@ -365,7 +371,7 @@ subsystems:
error:
noName: "No name specified."
info:
askConfirmation: "Are you sure you want to reset '%s'? [y/N]"
askConfirmation: "Are you sure you want to reset '%s'?"
success: "The subsystem '%s' has been reset."
options:
force:
Expand Down

0 comments on commit 1ce846f

Please sign in to comment.