From 54bfa7702e9bbacc128f0bc5b68153da823a87e3 Mon Sep 17 00:00:00 2001 From: ralph isenmann Date: Mon, 15 Feb 2021 13:27:41 +0100 Subject: [client] Update Language Tags (i18n) --- .../java/org/openslx/dozmod/gui/helper/I18n.java | 1 + .../openslx/dozmod/gui/panel/ContainerPanel.java | 13 +++++++---- .../wizard/layout/ContainerUploadPageLayout.java | 27 +++++++++------------- .../gui/wizard/page/ContainerUploadPage.java | 16 +++++-------- .../main/properties/i18n/page_layout.properties | 3 --- .../properties/i18n/page_layout_de_DE.properties | 3 --- .../properties/i18n/page_layout_tr_TR.properties | 3 --- .../src/main/properties/i18n/panel.properties | 10 ++++++++ .../main/properties/i18n/panel_de_DE.properties | 10 ++++++++ .../main/properties/i18n/panel_tr_TR.properties | 10 ++++++++ .../src/main/properties/i18n/window.properties | 3 --- .../main/properties/i18n/window_de_DE.properties | 3 --- .../main/properties/i18n/window_layout.properties | 2 -- .../properties/i18n/window_layout_de_DE.properties | 2 -- .../properties/i18n/window_layout_tr_TR.properties | 2 -- .../main/properties/i18n/window_tr_TR.properties | 3 --- 16 files changed, 57 insertions(+), 54 deletions(-) create mode 100644 dozentenmodul/src/main/properties/i18n/panel.properties create mode 100644 dozentenmodul/src/main/properties/i18n/panel_de_DE.properties create mode 100644 dozentenmodul/src/main/properties/i18n/panel_tr_TR.properties diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/I18n.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/I18n.java index 7c76d870..61fdb049 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/I18n.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/I18n.java @@ -17,6 +17,7 @@ public enum I18n { GUI("gui"), PAGE("page"), PAGE_LAYOUT("page_layout"), + PANEL("panel"), THRIFT("thrift"), WINDOW("window"), WINDOW_LAYOUT("window_layout"), diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/panel/ContainerPanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/panel/ContainerPanel.java index 53b3e199..d4e49fe6 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/panel/ContainerPanel.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/panel/ContainerPanel.java @@ -43,7 +43,9 @@ public class ContainerPanel extends JPanel { GridManager grdContainerMeta = new GridManager(pnlContainerMeta, 3); lblContainerRunOpt = new QLabel( - I18n.WINDOW_LAYOUT.getString("ImageDetails.Label.ContainerRunOptions.text")); + I18n.PANEL.getString("ContainerPanel.ContainerStartOptions.label")); + lblContainerRunOpt.setToolTipText( + I18n.PANEL.getString("ContainerPanel.ContainerStartOptions.tooltip")); grdContainerMeta.add(lblContainerRunOpt); txtContainerRun = new JTextField(); grdContainerMeta.add(txtContainerRun, 2).fill(true, false).expand(true, false); @@ -55,7 +57,8 @@ public class ContainerPanel extends JPanel { GridManager grdContainer = new GridManager(this, 2, false, new Insets(8, 2, 8, 2)); - lblContainerImageName = new QLabel(I18n.WINDOW_LAYOUT.getString("ImageDetails.Label.ImageName.text")); + lblContainerImageName = new QLabel( + I18n.PANEL.getString("ContainerPanel.Label.ImageName.text")); grdContainer.add(lblContainerImageName); txtContainerImageName = new JTextField(); grdContainer.add(txtContainerImageName, 1).fill(true, false).expand(true, false); @@ -114,7 +117,7 @@ public class ContainerPanel extends JPanel { private void initImageDetails() { - // currently do not allow user to change the Dockerfile in the suite. + // currently do not allow user to change the Dockerfile in the suite. txtContainerRecipe.setEnabled(false); lblContainerRunOpt.setVisible(false); txtContainerRun.setVisible(false); @@ -129,7 +132,9 @@ public class ContainerPanel extends JPanel { } public void addToChangeMonitor(DialogChangeMonitor changeMonitor) { - changeMonitor.add(txtContainerRecipe); + changeMonitor.add(txtContainerRecipe) + .addConstraint(new DialogChangeMonitor.TextNotEmptyConstraint( + "ContainerPanel.Constraint.NoEmptyDockerfile.text")); changeMonitor.add(txtContainerRun); changeMonitor.add(bindMountConfigurator); } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ContainerUploadPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ContainerUploadPageLayout.java index 57eed300..bd49a500 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ContainerUploadPageLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ContainerUploadPageLayout.java @@ -35,7 +35,8 @@ public class ContainerUploadPageLayout extends WizardPage { JPanel p1 = new JPanel(); p1.setVisible(true); GridManager g1 = new GridManager(p1, 3, true, new Insets(5, 0, 5, 0)); - QLabel imageFileCaption = new QLabel(I18n.PAGE_LAYOUT.getString("ContainerUploadPage.DockerFile.label")); + QLabel imageFileCaption = new QLabel( + I18n.PAGE_LAYOUT.getString("ContainerUploadPage.DockerFile.label")); txtImageFile = new JTextField(); txtImageFile.setEditable(false); btnBrowseForImage = new JButton(I18n.PAGE_LAYOUT.getString("ImageUpload.Button.browseForImage.text")); @@ -49,11 +50,11 @@ public class ContainerUploadPageLayout extends WizardPage { p2.setVisible(false); GridManager g2 = new GridManager(p2, 2, true, new Insets(5, 0, 5, 0)); QLabel lblGitRepo = new QLabel(I18n.PAGE_LAYOUT.getString("ContainerUploadPage.GitRepository.label")); - lblGitRepo.setToolTipText(I18n.PAGE_LAYOUT.getString( - "ContainerUploadPage.GitRepository.toolTipText")); + lblGitRepo.setToolTipText( + I18n.PAGE_LAYOUT.getString("ContainerUploadPage.GitRepository.toolTipText")); txtGitRepo = new JTextField(); - txtGitRepo.setToolTipText(I18n.PAGE_LAYOUT.getString( - "ContainerUploadPage.GitRepository.toolTipText")); + txtGitRepo.setToolTipText( + I18n.PAGE_LAYOUT.getString("ContainerUploadPage.GitRepository.toolTipText")); g2.add(lblGitRepo); g2.add(txtGitRepo).fill(true, false).expand(true, false); g2.finish(false); @@ -68,30 +69,24 @@ public class ContainerUploadPageLayout extends WizardPage { // Start as with Dockerfile as input! tpInput.setSelectedIndex(0); - lblImageName = new QLabel(I18n.PAGE_LAYOUT.getString( - "ContainerUploadPage.ImageName.text")); + lblImageName = new QLabel(I18n.PANEL.getString("ContainerPanel.Label.ImageName.text")); txtImageName = new JTextField(); grid.add(lblImageName); grid.add(txtImageName, 2, 1).fill(true, false).expand(true, false); grid.nextRow(); // -- Software license changed - shown only in UploadWizard -- - chkLicenseRestricted = new JCheckBox(I18n.PAGE_LAYOUT.getString("ContainerUploadPage.CheckBox.ContainsLicenseRestricted.text")); + chkLicenseRestricted = new JCheckBox( + I18n.PAGE_LAYOUT.getString("ContainerUploadPage.CheckBox.ContainsLicenseRestricted.text")); chkLicenseRestricted.setVisible(false); grid.skip(); grid.add(chkLicenseRestricted, 2, 1).fill(false, false).expand(true, false); grid.nextRow(); -// lblContainerRun = new QLabel(I18n.PAGE_LAYOUT.getString("ContainerUploadPage.ContainerStartOptions.label")); -// lblContainerRun.setToolTipText(I18n.PAGE_LAYOUT.getString("ContainerUploadPage.ContainerStartOptions.tooltip")); -// txtContainerRun = new JTextField(); -// grid.add(lblContainerRun); -// grid.add(txtContainerRun, 2, 1).fill(true, false).expand(true, false); -// grid.nextRow(); - grid.add(Box.createVerticalGlue(), 3).expand(true, true); txtInfoText = new JTextArea(); - txtInfoText.setBorder(BorderFactory.createTitledBorder(I18n.PAGE_LAYOUT.getString("ContainerUploadPage.Infobox.label"))); + txtInfoText.setBorder(BorderFactory.createTitledBorder( + I18n.PAGE_LAYOUT.getString("ContainerUploadPage.Infobox.label"))); txtInfoText.setLineWrap(true); txtInfoText.setWrapStyleWord(true); txtInfoText.setEditable(false); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java index 234e0a0e..ca39f170 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java @@ -40,15 +40,16 @@ public class ContainerUploadPage extends ContainerUploadPageLayout { private final Logger LOGGER = Logger.getLogger(ContainerUploadPage.class); - /** - * Page for uploading an imagefile - * - * @param wizard - */ + private final UploadWizardState state; private final ImageDetailsRead existingImage; private final ContainerDefinition containerDefinition; + /** + * Page for uploading an Container Image + * + * @param wizard The wizard dialog in which this page is active. + */ public ContainerUploadPage(Wizard wizard, final UploadWizardState state) { super(wizard); this.containerDefinition = new ContainerDefinition(); @@ -206,11 +207,6 @@ public class ContainerUploadPage extends ContainerUploadPageLayout { setWarningMessage(I18n.PAGE.getString("ContainerUploadPage.Warning.NoProperName")); return false; } - -// if (txtContainerRun.getText() == null || txtContainerRun.getText().isEmpty()) { -// setWarningMessage(I18n.PAGE.getString("ContainerUploadPage.Warning.NoRunOptions")); -// return false; -// } return true; } diff --git a/dozentenmodul/src/main/properties/i18n/page_layout.properties b/dozentenmodul/src/main/properties/i18n/page_layout.properties index ce8b6dc9..f6047781 100644 --- a/dozentenmodul/src/main/properties/i18n/page_layout.properties +++ b/dozentenmodul/src/main/properties/i18n/page_layout.properties @@ -63,10 +63,7 @@ ContainerUploadPage.description=Please provide an Input for a Docker Image ContainerUploadPage.DockerFile.label=Docker File ContainerUploadPage.GitRepository.label=Git Repository ContainerUploadPage.GitRepository.toolTipText=Set clone address of Git Repository [git@ | http://] [.git]. Currently no Checks! -ContainerUploadPage.ImageName.text=Name ContainerUploadPage.CheckBox.ContainsLicenseRestricted.text=Contains license restricted software -ContainerUploadPage.ContainerStartOptions.label=Container Start Options -ContainerUploadPage.ContainerStartOptions.tooltip=Please provide the Container Run Options (Port, Name, Env,...) ContainerUploadPage.Infobox.label=Information ContainerUploadPage.Infobox.text=Please provide all the information needed to define a container image. diff --git a/dozentenmodul/src/main/properties/i18n/page_layout_de_DE.properties b/dozentenmodul/src/main/properties/i18n/page_layout_de_DE.properties index c1aa6650..8eced6c6 100644 --- a/dozentenmodul/src/main/properties/i18n/page_layout_de_DE.properties +++ b/dozentenmodul/src/main/properties/i18n/page_layout_de_DE.properties @@ -63,10 +63,7 @@ ContainerUploadPage.description=Bitte geben Sie Daten für das Docker Image an ContainerUploadPage.DockerFile.label=Docker File ContainerUploadPage.GitRepository.label=Git Repository ContainerUploadPage.GitRepository.toolTipText=Clone Addresse des Git Repositories setzen. [git@ | http://] [.git]. Momentan noch keine Checks! -ContainerUploadPage.ImageName.text=Name ContainerUploadPage.CheckBox.ContainsLicenseRestricted.text=Enthält lizenzpflichtige Software -ContainerUploadPage.ContainerStartOptions.label=Container Start Optionen -ContainerUploadPage.ContainerStartOptions.tooltip=Bitte die Container Start Optionen angeben (Port, Name, Env,...) ContainerUploadPage.Infobox.label=Hinweis ContainerUploadPage.Infobox.text=In dieser Maske sind alle Infromationen zur Definition eines Container Images anzugeben. diff --git a/dozentenmodul/src/main/properties/i18n/page_layout_tr_TR.properties b/dozentenmodul/src/main/properties/i18n/page_layout_tr_TR.properties index 9c2daf0f..f85b555e 100644 --- a/dozentenmodul/src/main/properties/i18n/page_layout_tr_TR.properties +++ b/dozentenmodul/src/main/properties/i18n/page_layout_tr_TR.properties @@ -52,10 +52,7 @@ ContainerUploadPage.description=Lütfen Docker görüntüsü için gerekli bilgi ContainerUploadPage.DockerFile.label=Dockerfile ContainerUploadPage.GitRepository.label=Git deposu ContainerUploadPage.GitRepository.toolTipText=Git deposunun klon adresini belirtin. [git@ | http://] [.git]. Check iÅŸlemleri ÅŸimdilik desteklenmemektedir! -ContainerUploadPage.ImageName.text=Görüntü adı ContainerUploadPage.CheckBox.ContainsLicenseRestricted.text=Lisans gerektiren yazılım içeriyor -ContainerUploadPage.ContainerStartOptions.label=Container baÅŸlatma seçenekleri -ContainerUploadPage.ContainerStartOptions.tooltip=Lütfen container baÅŸlatma seçeneklerini girin (Port, Name, Env,...) ContainerUploadPage.Infobox.label=Uyarı ContainerUploadPage.Infobox.text=Bir Docker görüntüsü tanımlamak için gereken tüm bilgilerin saÄŸlanması gerekmektedir. diff --git a/dozentenmodul/src/main/properties/i18n/panel.properties b/dozentenmodul/src/main/properties/i18n/panel.properties new file mode 100644 index 00000000..a8db9131 --- /dev/null +++ b/dozentenmodul/src/main/properties/i18n/panel.properties @@ -0,0 +1,10 @@ +# ContainerPanel +ContainerPanel.ContainerStartOptions.label=Container Start Options +ContainerPanel.ContainerStartOptions.tooltip=Please provide the Container Run Options (Port, Name, Env,...) +ContainerPanel.Label.ImageName.text=Image Name + +ContainerPanel.Constraint.NoEmptyDockerfile.text=Empty Dockerfile not allowed! + +# UNUSED +ImageDetails.Constraint.NoEmptyName.text=Empty Name not allowed! +ImageDetails.Constraint.NoEmptyRunOptions.text=No Container Run Options provided! diff --git a/dozentenmodul/src/main/properties/i18n/panel_de_DE.properties b/dozentenmodul/src/main/properties/i18n/panel_de_DE.properties new file mode 100644 index 00000000..832480bb --- /dev/null +++ b/dozentenmodul/src/main/properties/i18n/panel_de_DE.properties @@ -0,0 +1,10 @@ +# ContainerPanel +ContainerPanel.ContainerStartOptions.label=Container Start Optionen +ContainerPanel.ContainerStartOptions.tooltip=Bitte die Container Start Optionen angeben (Port, Name, Env,...) +ContainerPanel.Label.ImageName.text=Image Name + +ContainerPanel.Constraint.NoEmptyDockerfile.text=Es muss ein Dockerfile angegeben werden! + +# UNUSED +ImageDetails.Constraint.NoEmptyName.text=Es muss ein Name angegeben werden! +ImageDetails.Constraint.NoEmptyRunOptions.text=Keine Container Start Optionen angegeben! diff --git a/dozentenmodul/src/main/properties/i18n/panel_tr_TR.properties b/dozentenmodul/src/main/properties/i18n/panel_tr_TR.properties new file mode 100644 index 00000000..09416eef --- /dev/null +++ b/dozentenmodul/src/main/properties/i18n/panel_tr_TR.properties @@ -0,0 +1,10 @@ +# ContainerPanel +ContainerPanel.ContainerStartOptions.label=Container ba?latma seçenekleri +ContainerPanel.ContainerStartOptions.tooltip=Lütfen container ba?latma seçeneklerini girin (Port, Name, Env,...) +ContainerPanel.Label.ImageName.text=Görüntü ad? + +ContainerPanel.Constraint.NoEmptyDockerfile.text=Dockerfile bo? b?rak?lamaz! + +# UNUSED +ImageDetails.Constraint.NoEmptyName.text=Görüntü ad? bo? b?rak?lamaz! +ImageDetails.Constraint.NoEmptyRunOptions.text=Container ba?latma seçenekleri girilmedi! diff --git a/dozentenmodul/src/main/properties/i18n/window.properties b/dozentenmodul/src/main/properties/i18n/window.properties index 924e37fd..ed908af3 100644 --- a/dozentenmodul/src/main/properties/i18n/window.properties +++ b/dozentenmodul/src/main/properties/i18n/window.properties @@ -53,9 +53,6 @@ ImageDetails.Message.error.performImageDownload=Selected version is invalid ImageDetails.Message.error.extendVersionExpiry=Could not extend expiry date of version {0}. ImageDetails.Message.info.extendVersionExpiry=Successfully extended images: {0} ImageDetails.Message.yesNo.safeClose=Changes will be discarded, do you really want to close? -ImageDetails.Constraint.NoEmptyDockerfile.text=Empty Dockerfile not allowed! -ImageDetails.Constraint.NoEmptyName.text=Empty Name not allowed! -ImageDetails.Constraint.NoEmptyRunOptions.text=No Container Run Options provided! # ImageListWindow ImageList.MenuItem.newLecture.text=New lecture diff --git a/dozentenmodul/src/main/properties/i18n/window_de_DE.properties b/dozentenmodul/src/main/properties/i18n/window_de_DE.properties index 181c140e..96c7efb1 100644 --- a/dozentenmodul/src/main/properties/i18n/window_de_DE.properties +++ b/dozentenmodul/src/main/properties/i18n/window_de_DE.properties @@ -53,9 +53,6 @@ ImageDetails.Message.error.performImageDownload=Ausgewählte Version ist ungült ImageDetails.Message.error.extendVersionExpiry=Konnte Ablaufdatum der Version {0} nicht verlängern. ImageDetails.Message.info.extendVersionExpiry=Erfolgreich verlängerte Abbilder: {0} ImageDetails.Message.yesNo.safeClose=Änderungen werden verworfen, wollen Sie wirklich schließen? -ImageDetails.Constraint.NoEmptyDockerfile.text=Es muss ein Dockerfile angegeben werden! -ImageDetails.Constraint.NoEmptyName.text=Es muss ein Name angegeben werden! -ImageDetails.Constraint.NoEmptyRunOptions.text=Keine Container Start Optionen angegeben! # ImageListWindow ImageList.MenuItem.newLecture.text=Neue Veranstaltung diff --git a/dozentenmodul/src/main/properties/i18n/window_layout.properties b/dozentenmodul/src/main/properties/i18n/window_layout.properties index c2040724..2d9b78c4 100644 --- a/dozentenmodul/src/main/properties/i18n/window_layout.properties +++ b/dozentenmodul/src/main/properties/i18n/window_layout.properties @@ -69,8 +69,6 @@ ImageDetails.Button.close.text=Close ImageDetails.Tab.overview.title=Overview ImageDetails.Tab.versions.title=VM-Versions ImageDetails.Tab.permissions.title=Permissions -ImageDetails.Label.ImageName.text=Image Name -ImageDetails.Label.ContainerRunOptions.text=Container Run Options # ImageListWindowLayout ImageList.Label.title.text=Overview virtual machines diff --git a/dozentenmodul/src/main/properties/i18n/window_layout_de_DE.properties b/dozentenmodul/src/main/properties/i18n/window_layout_de_DE.properties index 734f5530..b4b4a9b7 100644 --- a/dozentenmodul/src/main/properties/i18n/window_layout_de_DE.properties +++ b/dozentenmodul/src/main/properties/i18n/window_layout_de_DE.properties @@ -69,8 +69,6 @@ ImageDetails.Button.close.text=Schließen ImageDetails.Tab.overview.title=Ãœbersicht ImageDetails.Tab.versions.title=VM-Versionen ImageDetails.Tab.permissions.title=Berechtigungen -ImageDetails.Label.ImageName.text=Image Name -ImageDetails.Label.ContainerRunOptions.text=Container Start Optionen # ImageListWindowLayout ImageList.Label.title.text=Ãœbersicht Virtuelle Maschinen diff --git a/dozentenmodul/src/main/properties/i18n/window_layout_tr_TR.properties b/dozentenmodul/src/main/properties/i18n/window_layout_tr_TR.properties index 57fe904e..77709be6 100644 --- a/dozentenmodul/src/main/properties/i18n/window_layout_tr_TR.properties +++ b/dozentenmodul/src/main/properties/i18n/window_layout_tr_TR.properties @@ -69,8 +69,6 @@ ImageDetails.Button.close.text=Kapat ImageDetails.Tab.overview.title=Genel görünüm ImageDetails.Tab.versions.title=Sanal makine sürümleri ImageDetails.Tab.permissions.title=EriÅŸim izinleri -ImageDetails.Label.ImageName.text=Görüntü adı -ImageDetails.Label.ContainerRunOptions.text=Container baÅŸlatma seçenekleri # ImageListWindowLayout ImageList.Label.title.text=Sanal makineler genel görünümü diff --git a/dozentenmodul/src/main/properties/i18n/window_tr_TR.properties b/dozentenmodul/src/main/properties/i18n/window_tr_TR.properties index 1d5e2f93..8d22cf05 100644 --- a/dozentenmodul/src/main/properties/i18n/window_tr_TR.properties +++ b/dozentenmodul/src/main/properties/i18n/window_tr_TR.properties @@ -53,9 +53,6 @@ ImageDetails.Message.error.performImageDownload=Seçilen sürüm geçersiz ImageDetails.Message.error.extendVersionExpiry={0} sürümünün geçerlilik tarihi uzatılamadı. ImageDetails.Message.info.extendVersionExpiry=BaÅŸarılı bir ÅŸekilde uzatılmış olan imajlar: {0} ImageDetails.Message.yesNo.safeClose=DeÄŸiÅŸiklikler iptal edilecek, gerçekten kapatmak istiyor musunuz? -ImageDetails.Constraint.NoEmptyDockerfile.text=Dockerfile boÅŸ bırakılamaz! -ImageDetails.Constraint.NoEmptyName.text=Görüntü adı boÅŸ bırakılamaz! -ImageDetails.Constraint.NoEmptyRunOptions.text=Container baÅŸlatma seçenekleri girilmedi! # ImageListWindow ImageList.MenuItem.newLecture.text=Yeni etkinlik -- cgit v1.2.3-55-g7522