Skip to content

Commit

Permalink
[processing] reword error messages about missing GRASS (fix #46052)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexbruy authored and nyalldawson committed Feb 3, 2022
1 parent 716673d commit a5baaf3
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions python/plugins/grassprovider/Grass7Utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -505,10 +505,9 @@ def checkGrassIsInstalled(ignorePreviousState=False):
cmdpath = os.path.join(Grass7Utils.path, 'bin', 'r.out.gdal.exe')
if not os.path.exists(cmdpath):
return Grass7Utils.tr(
'The specified GRASS 7 folder "{}" does not contain '
'a valid set of GRASS 7 modules.\nPlease, go to the '
'Processing settings dialog, and check that the '
'GRASS 7\nfolder is correctly configured'.format(os.path.join(Grass7Utils.path, 'bin')))
'The GRASS GIS folder "{}" does not contain a valid set '
'of GRASS modules.\nPlease, check that GRASS is correctly '
'installed and available on your system.'.format(os.path.join(Grass7Utils.path, 'bin')))
Grass7Utils.isGrassInstalled = True
return
# Return error messages
Expand All @@ -517,8 +516,9 @@ def checkGrassIsInstalled(ignorePreviousState=False):
if isWindows() or isMac():
if Grass7Utils.path is None:
return Grass7Utils.tr(
'GRASS GIS 7 folder is not configured. Please configure '
'it before running GRASS GIS 7 algorithms.')
'Could not locate GRASS GIS folder. Please make '
'sure that GRASS GIS is correctly installed before '
'running GRASS algorithms.')
if Grass7Utils.command is None:
return Grass7Utils.tr(
'GRASS GIS 7 binary {0} can\'t be found on this system from a shell. '
Expand Down

0 comments on commit a5baaf3

Please sign in to comment.