Fixes #632 and #634 - update existing/add missing localized messages (#636)

Author: akerekes

plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/messages.properties

@@ -5,11 +5,16 @@ google.preferences=Google Cloud Platform-related settings
 auto.promote=Promote the deployed version to receive all traffic
 bucket.name=Bucket:
 cannot.open.browser=Cannot open browser: {0}
+deploy.login.dialog.message=Browser opened to authorize deployment.
 deploy.manual.link=To manually promote a version use the <a href="{0}">Google Cloud Console.</a>
 deploy.preferences.save.error.title=Could not save preferences
 deploy.preferences.save.error.message=Error while saving the preferences: {0}
-deploy.prompt.projectid=Always prompt for project ID on deploy
-deploy.prompt.projectid.long=During deploy you will have the opportunity to provide another value for project ID that will be used instead of the project ID set on this page.
+deploy.prompt.projectid=Prompt for project ID on deploy
+deploy.prompt.projectid.long=It will override the project ID set on this page.
+dialog.prompt.projectId.title=Enter project ID
+dialog.prompt.projectId.message=Project ID to use for deployment
+error.projectId.missing=Project ID must be set for deploy.
+error.projectId.prefix=Error: {0}
 project.id=Project ID:
 project.version=Version:
 settings.advanced=Advanced

plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/standard/StandardDeployCommandHandler.java

@@ -39,13 +39,13 @@
 import com.google.cloud.tools.appengine.api.deploy.DefaultDeployConfiguration;
 import com.google.cloud.tools.eclipse.appengine.deploy.AppEngineProjectDeployer;
 import com.google.cloud.tools.eclipse.appengine.deploy.CleanupOldDeploysJob;
-import com.google.cloud.tools.eclipse.appengine.deploy.Messages;
 import com.google.cloud.tools.eclipse.appengine.deploy.standard.ExplodedWarPublisher;
 import com.google.cloud.tools.eclipse.appengine.deploy.standard.StandardDeployJob;
 import com.google.cloud.tools.eclipse.appengine.deploy.standard.StandardDeployJobConfig;
 import com.google.cloud.tools.eclipse.appengine.deploy.standard.StandardDeployPreferences;
 import com.google.cloud.tools.eclipse.appengine.deploy.standard.StandardDeployPreferencesConverter;
 import com.google.cloud.tools.eclipse.appengine.deploy.standard.StandardProjectStaging;
+import com.google.cloud.tools.eclipse.appengine.deploy.ui.Messages;
 import com.google.cloud.tools.eclipse.appengine.login.IGoogleLoginService;
 import com.google.cloud.tools.eclipse.sdk.ui.MessageConsoleWriterOutputLineListener;
 import com.google.cloud.tools.eclipse.ui.util.MessageConsoleUtilities;
@@ -156,7 +156,24 @@ private String promptForProjectId(Shell shell, String initialValue) throws Deplo
                     Messages.getString("dialog.prompt.projectId.title"),
                     Messages.getString("dialog.prompt.projectId.message"),
                     initialValue,
-                    new ProjectIdValidator());
+                    new ProjectIdValidator() {
+                      @Override
+                      // The input dialog does not provide decoration for the error message,
+                      // make errors more recognizable with modified validation messages
+                      // FIXME https://github.com/GoogleCloudPlatform/cloud-tools-for-eclipse/issues/635
+                      public String isValid(String newText) {
+                        String error = super.isValid(newText);
+                        if (error != null) {
+                          if (error.isEmpty()) {
+                            return Messages.getString("error.projectId.invalid");
+                          } else {
+                            return Messages.getString("error.projectId.prefix", error);
+                          }
+                        } else {
+                          return null;
+                        }
+                      }
+    });
     int result = dialog.open();
     if (result == Window.OK) {
       return dialog.getValue();

plugins/com.google.cloud.tools.eclipse.appengine.deploy/src/com/google/cloud/tools/eclipse/appengine/deploy/messages.properties

@@ -2,7 +2,6 @@ missing.appengine.xml.element=Cannot read element in appengine-web.xml:
 cannot.parse.appengine.xml=Cannot parse appengine-web.xml
 cleanup.deploy.job.name=Delete old deploy work directories
 cleanup.deploy.job.error=Cannot delete old deploy work directories
-error.projectId.missing=Project Id must be set for deploy.
 task.name.deploy.project=Deploying project
 task.name.stage.project=Staging exploded WAR
 task.name.publish.war=Publish exploded WAR
@@ -11,5 +10,4 @@ deploy.standard.runnable.name=Deploying to App Engine Standard
 deploy.job.stagingdir.create.failed=Cannot create staging directory.
 deploy.job.sourcedir.missing=Staging source directory does not exist.
 deploy.failed.error.message=Deploy failed.
-save.credential.failed=Saving credential to file failed.
-deploy.login.dialog.message=Browser opened to authorize deployment.
+save.credential.failed=Saving credential to file failed.