From 399cc7f1f0067020ac9d4dd8d8e98fef91780e22 Mon Sep 17 00:00:00 2001 From: Wolfgang Kaltz Date: Thu, 14 Mar 2019 13:58:18 +0100 Subject: [PATCH] fix typos in user messages --- geoportal/c2cgeoportal_geoportal/scripts/c2cupgrade.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/geoportal/c2cgeoportal_geoportal/scripts/c2cupgrade.py b/geoportal/c2cgeoportal_geoportal/scripts/c2cupgrade.py index 879880ac51..049e0e11a9 100644 --- a/geoportal/c2cgeoportal_geoportal/scripts/c2cupgrade.py +++ b/geoportal/c2cgeoportal_geoportal/scripts/c2cupgrade.py @@ -177,7 +177,7 @@ def decorate(c2cupgradetool, *args, **kwargs): def message(): c2cupgradetool.print_step( self.step_number, error=True, - message="The step get an error '{}'.".format(ex), + message="The step had the error '{}'.".format(ex), prompt="Fix the error and run the step again:" ) atexit.register(message) @@ -572,10 +572,10 @@ def files_to_get(self, step, pre=False): except PermissionError as e: self.print_step( step, error=True, message=( - "All your project files should be own by your user, " + "All your project files should be owned by your user, " "current error:\n" + str(e) ), - prompt="Fix it and run again the upgrade:") + prompt="Fix it and run the upgrade again:") exit(1) elif os.path.exists(destination) and not filecmp.cmp(source, destination): @@ -640,7 +640,7 @@ def step9(self, step): step + 1, message="Manually apply the ngeo application changes as shown in the `ngeo.diff` file.\n" + DIFF_NOTICE + - "\nNote that you can also apply it using: git apply --3way ngeo.diff" + "\nNote that you can also apply them using: git apply --3way ngeo.diff" ) @Step(10) @@ -671,7 +671,7 @@ def step10(self, step): self.print_step( step + 1, message="The `create.diff` file is a recommendation of the changes that you " "should apply to your project.\n" + DIFF_NOTICE + - "\nNote that you can also apply it using: git apply --3way create.diff" + "\nNote that you can also apply them using: git apply --3way create.diff" ) else: self.run_step(step + 1)