fix: revert localizations

rohank07 · rohank07 · commit 40f1aea46be4 · 2022-01-11T18:28:47.000-05:00
diff --git a/src/gwt/src/org/rstudio/studio/client/projects/StudioClientProjectConstants.java b/src/gwt/src/org/rstudio/studio/client/projects/StudioClientProjectConstants.java
@@ -2124,15 +2124,6 @@ public interface StudioClientProjectConstants extends com.google.gwt.i18n.client
     @Key("packageLabel")
     String packageLabel();
 
-    /**
-     * Translated "package".
-     *
-     * @return translated "package"
-     */
-    @DefaultMessage("package")
-    @Key("packageValue")
-    String packageValue();
-
     /**
      * Translated "Git/SVN".
      *
diff --git a/src/gwt/src/org/rstudio/studio/client/projects/StudioClientProjectConstants_en.properties b/src/gwt/src/org/rstudio/studio/client/projects/StudioClientProjectConstants_en.properties
@@ -229,7 +229,6 @@ chkPreviewAfterBuilding=Preview book after building
 allFormatsLabel=(All Formats)
 buildToolsLabel=Build Tools
 projectBuildToolsLabel=Project build tools:
-packageValue=package
 gitLabel=Git/SVN
 closeProjectLabel=Close Project
 placeholderLabel=placeholder
diff --git a/src/gwt/src/org/rstudio/studio/client/projects/StudioClientProjectConstants_fr.properties b/src/gwt/src/org/rstudio/studio/client/projects/StudioClientProjectConstants_fr.properties
@@ -222,7 +222,6 @@ chkPreviewAfterBuilding=Prévisualisation du livre après sa construction
 allFormatsLabel=(Tous les formats)
 buildToolsLabel=Outils de construction
 projectBuildToolsLabel=Outils de construction du projet :
-packageValue=paquet
 gitLabel=Git/SVN
 closeProjectLabel=Fermer le projet
 placeholderLabel=placeholder
diff --git a/src/gwt/src/org/rstudio/studio/client/projects/ui/newproject/NewPackagePage.java b/src/gwt/src/org/rstudio/studio/client/projects/ui/newproject/NewPackagePage.java
@@ -92,7 +92,7 @@ protected boolean getOptionsSideBySide()
    protected void onAddTopPanelWidgets(HorizontalPanel panel)
    {
       String[] labels = {constants_.packageLabel()};
-      String[] values = {constants_.packageValue()};
+      String[] values = {"package"};
       listProjectType_ = new SelectWidget(constants_.typeLabel(),
                                           labels,
                                           values,
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/prefs/PrefsConstants.java b/src/gwt/src/org/rstudio/studio/client/workbench/prefs/PrefsConstants.java
@@ -1553,33 +1553,6 @@ public interface PrefsConstants extends com.google.gwt.i18n.client.Messages {
     @Key("serverHomePageNeverOption")
     String serverHomePageNeverOption();
 
-    /**
-     * Translated "sessions".
-     *
-     * @return translated "sessions"
-     */
-    @DefaultMessage("sessions")
-    @Key("serverHomePageSessions")
-    String serverHomePageSessions();
-
-    /**
-     * Translated "always".
-     *
-     * @return translated "always"
-     */
-    @DefaultMessage("always")
-    @Key("serverHomePageAlways")
-    String serverHomePageAlways();
-
-    /**
-     * Translated "never".
-     *
-     * @return translated "never"
-     */
-    @DefaultMessage("never")
-    @Key("serverHomePageNever")
-    String serverHomePageNever();
-
     /**
      * Translated "Re-use idle sessions for project links".
      *
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/prefs/PrefsConstants_en.properties b/src/gwt/src/org/rstudio/studio/client/workbench/prefs/PrefsConstants_en.properties
@@ -165,9 +165,6 @@ serverHomePageLabel=Show server home page:
 serverHomePageActiveSessionsOption=Multiple active sessions
 serverHomePageAlwaysOption=Always
 serverHomePageNeverOption=Never
-serverHomePageSessions=sessions
-serverHomePageAlways=always
-serverHomePageNever=never
 reUseIdleSessionLabel=Re-use idle sessions for project links
 desktopCaption=Home Page
 advancedDebuggingCaption=Debugging
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/prefs/PrefsConstants_fr.properties b/src/gwt/src/org/rstudio/studio/client/workbench/prefs/PrefsConstants_fr.properties
@@ -165,9 +165,6 @@ serverHomePageLabel=Afficher la page d''accueil du serveur :
 serverHomePageActiveSessionsOption=Sessions actives multiples
 serverHomePageAlwaysOption=Toujours
 serverHomePageNeverOption=Jamais
-serverHomePageSessions=sessions
-serverHomePageAlways=toujours
-serverHomePageNever=jamais
 reUseIdleSessionLabel=Réutiliser les sessions inutilisées pour les liens du projet
 desktopCaption=Page d''accueil
 advancedDebuggingCaption=Débogage
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/prefs/views/GeneralPreferencesPane.java b/src/gwt/src/org/rstudio/studio/client/workbench/prefs/views/GeneralPreferencesPane.java
@@ -245,9 +245,9 @@ public void onClick(ClickEvent event)
                   constants_.serverHomePageNeverOption()
             },
             new String[] {
-                  constants_.serverHomePageSessions(),
-                  constants_.serverHomePageAlways(),
-                  constants_.serverHomePageNever()
+                      "sessions",
+                      "always",
+                      "never"
             },
             false,
             true,

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ protected boolean getOptionsSideBySide()`
`92`	`92`	`protected void onAddTopPanelWidgets(HorizontalPanel panel)`
`93`	`93`	`{`
`94`	`94`	`String[] labels = {constants_.packageLabel()};`
`95`		`- String[] values = {constants_.packageValue()};`
	`95`	`+ String[] values = {"package"};`
`96`	`96`	`listProjectType_ = new SelectWidget(constants_.typeLabel(),`
`97`	`97`	`labels,`
`98`	`98`	`values,`