github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40505 from brendandburns/i18n5

Browse Source 
Automatic merge from submit-queue

Extract strings from the rollout command.

@fabianofranz @kubernetes/sig-cli-pr-reviews
This commit is contained in:
Kubernetes Submit Queue 2017-02-16 16:45:32 -08:00 committed by GitHub
commit 9443d85c4b
12 changed files with 139 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
pkg/generated/bindata.go
View File

File diff suppressed because one or more lines are too long

1
pkg/kubectl/cmd/rollout/BUILD
View File

@ -24,6 +24,7 @@ go_library(
"//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/templates:go_default_library",
"//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/cmd/util:go_default_library",
"//pkg/kubectl/resource:go_default_library", "//pkg/kubectl/resource:go_default_library",
"//pkg/util/i18n:go_default_library",
"//pkg/util/interrupt:go_default_library", "//pkg/util/interrupt:go_default_library",
"//vendor:github.com/renstrom/dedent", "//vendor:github.com/renstrom/dedent",
"//vendor:github.com/spf13/cobra", "//vendor:github.com/spf13/cobra",

3
pkg/kubectl/cmd/rollout/rollout.go
View File

@ -23,6 +23,7 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates" "k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/util/i18n"
) )
var ( var (
@ -43,7 +44,7 @@ func NewCmdRollout(f cmdutil.Factory, out, errOut io.Writer) *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "rollout SUBCOMMAND", Use: "rollout SUBCOMMAND",
Short: "Manage a deployment rollout", Short: i18n.T("Manage a deployment rollout"),
Long: rollout_long, Long: rollout_long,
Example: rollout_example, Example: rollout_example,
Run: cmdutil.DefaultSubCommandRun(errOut), Run: cmdutil.DefaultSubCommandRun(errOut),

3
pkg/kubectl/cmd/rollout/rollout_history.go
View File

@ -24,6 +24,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl/cmd/templates" "k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/resource" "k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/util/i18n"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -48,7 +49,7 @@ func NewCmdRolloutHistory(f cmdutil.Factory, out io.Writer) *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "history (TYPE NAME | TYPE/NAME) [flags]", Use: "history (TYPE NAME | TYPE/NAME) [flags]",
Short: "View rollout history", Short: i18n.T("View rollout history"),
Long: history_long, Long: history_long,
Example: history_example, Example: history_example,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {

3
pkg/kubectl/cmd/rollout/rollout_pause.go
View File

@ -31,6 +31,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl/cmd/templates" "k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/resource" "k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/util/i18n"
) )
// PauseConfig is the start of the data required to perform the operation. As new fields are added, add them here instead of // PauseConfig is the start of the data required to perform the operation. As new fields are added, add them here instead of
@ -70,7 +71,7 @@ func NewCmdRolloutPause(f cmdutil.Factory, out io.Writer) *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "pause RESOURCE", Use: "pause RESOURCE",
Short: "Mark the provided resource as paused", Short: i18n.T("Mark the provided resource as paused"),
Long: pause_long, Long: pause_long,
Example: pause_example, Example: pause_example,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {

3
pkg/kubectl/cmd/rollout/rollout_resume.go
View File

@ -31,6 +31,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl/cmd/templates" "k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/resource" "k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/util/i18n"
) )
// ResumeConfig is the start of the data required to perform the operation. As new fields are added, add them here instead of // ResumeConfig is the start of the data required to perform the operation. As new fields are added, add them here instead of
@ -68,7 +69,7 @@ func NewCmdRolloutResume(f cmdutil.Factory, out io.Writer) *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "resume RESOURCE", Use: "resume RESOURCE",
Short: "Resume a paused resource", Short: i18n.T("Resume a paused resource"),
Long: resume_long, Long: resume_long,
Example: resume_example, Example: resume_example,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {

3
pkg/kubectl/cmd/rollout/rollout_status.go
View File

@ -25,6 +25,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl/cmd/templates" "k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/resource" "k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/util/i18n"
"k8s.io/kubernetes/pkg/util/interrupt" "k8s.io/kubernetes/pkg/util/interrupt"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@ -54,7 +55,7 @@ func NewCmdRolloutStatus(f cmdutil.Factory, out io.Writer) *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "status (TYPE NAME | TYPE/NAME) [flags]", Use: "status (TYPE NAME | TYPE/NAME) [flags]",
Short: "Show the status of the rollout", Short: i18n.T("Show the status of the rollout"),
Long: status_long, Long: status_long,
Example: status_example, Example: status_example,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {

3
pkg/kubectl/cmd/rollout/rollout_undo.go
View File

@ -26,6 +26,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl/cmd/templates" "k8s.io/kubernetes/pkg/kubectl/cmd/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/resource" "k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/util/i18n"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -68,7 +69,7 @@ func NewCmdRolloutUndo(f cmdutil.Factory, out io.Writer) *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "undo (TYPE NAME | TYPE/NAME) [flags]", Use: "undo (TYPE NAME | TYPE/NAME) [flags]",
Short: "Undo a previous rollout", Short: i18n.T("Undo a previous rollout"),
Long: undo_long, Long: undo_long,
Example: undo_example, Example: undo_example,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {

BIN
translations/kubectl/default/LC_MESSAGES/k8s.mo
View File

Binary file not shown.

32
translations/kubectl/default/LC_MESSAGES/k8s.po
View File

@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: gettext-go-examples-hello\n" "Project-Id-Version: gettext-go-examples-hello\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-12-12 20:03+0000\n" "POT-Creation-Date: 2013-12-12 20:03+0000\n"
"PO-Revision-Date: 2017-02-06 22:31-0800\n" "PO-Revision-Date: 2017-02-11 22:14-0800\n"
"Last-Translator: Brendan Burns <brendan.d.burns@gmail.com>\n" "Last-Translator: Brendan Burns <brendan.d.burns@gmail.com>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -423,3 +423,33 @@ msgstr "Display Resource (CPU/Memory/Storage) usage of pods"
msgctxt "Print the client and server version information" msgctxt "Print the client and server version information"
msgid "Print the client and server version information" msgid "Print the client and server version information"
msgstr "Print the client and server version information" msgstr "Print the client and server version information"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/rollout/rollout.go#L46
msgctxt "Manage a deployment rollout"
msgid "Manage a deployment rollout"
msgstr "Manage a deployment rollout"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/rollout/rollout_history.go#L51
msgctxt "View rollout history"
msgid "View rollout history"
msgstr "View rollout history"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/rollout/rollout_pause.go#L73
msgctxt "Mark the provided resource as paused"
msgid "Mark the provided resource as paused"
msgstr "Mark the provided resource as paused"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/rollout/rollout_resume.go#L71
msgctxt "Resume a paused resource"
msgid "Resume a paused resource"
msgstr "Resume a paused resource"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/rollout/rollout_status.go#L57
msgctxt "Show the status of the rollout"
msgid "Show the status of the rollout"
msgstr "Show the status of the rollout"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/rollout/rollout_undo.go#L71
msgctxt "Undo a previous rollout"
msgid "Undo a previous rollout"
msgstr "Undo a previous rollout"

BIN
translations/kubectl/en_US/LC_MESSAGES/k8s.mo
View File

Binary file not shown.

32
translations/kubectl/en_US/LC_MESSAGES/k8s.po
View File

@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: gettext-go-examples-hello\n" "Project-Id-Version: gettext-go-examples-hello\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-12-12 20:03+0000\n" "POT-Creation-Date: 2013-12-12 20:03+0000\n"
"PO-Revision-Date: 2017-02-06 22:31-0800\n" "PO-Revision-Date: 2017-02-11 22:14-0800\n"
"Last-Translator: Brendan Burns <brendan.d.burns@gmail.com>\n" "Last-Translator: Brendan Burns <brendan.d.burns@gmail.com>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -423,3 +423,33 @@ msgstr "Display Resource (CPU/Memory/Storage) usage of pods"
msgctxt "Print the client and server version information" msgctxt "Print the client and server version information"
msgid "Print the client and server version information" msgid "Print the client and server version information"
msgstr "Print the client and server version information" msgstr "Print the client and server version information"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/rollout/rollout.go#L46
msgctxt "Manage a deployment rollout"
msgid "Manage a deployment rollout"
msgstr "Manage a deployment rollout"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/rollout/rollout_history.go#L51
msgctxt "View rollout history"
msgid "View rollout history"
msgstr "View rollout history"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/rollout/rollout_pause.go#L73
msgctxt "Mark the provided resource as paused"
msgid "Mark the provided resource as paused"
msgstr "Mark the provided resource as paused"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/rollout/rollout_resume.go#L71
msgctxt "Resume a paused resource"
msgid "Resume a paused resource"
msgstr "Resume a paused resource"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/rollout/rollout_status.go#L57
msgctxt "Show the status of the rollout"
msgid "Show the status of the rollout"
msgstr "Show the status of the rollout"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/rollout/rollout_undo.go#L71
msgctxt "Undo a previous rollout"
msgid "Undo a previous rollout"
msgstr "Undo a previous rollout"