i18n: Use complete source strings instead of fragments (Python)

gui/wxpython/core/render.py

@@ -765,20 +765,21 @@ def ReportProgress(self, env, layer=None):
                     self.progressInfo["downloading"].remove(layer)
 
         # for updating statusbar text
-        stText = ""
-        first = True
-        for layer in self.progressInfo["downloading"]:
-            if first:
-                stText += _("Downloading data ")
-                first = False
-            else:
-                stText += ", "
-            stText += "<%s>" % layer.GetName()
-        if stText:
-            stText += "..."
-
-        if self.progressInfo["range"] != len(self.progressInfo["rendered"]):
-            stText = _("Rendering & ") + stText if stText else _("Rendering...")
+        downloading = ", ".join(
+            "<%s>" % downloading_layer.GetName()
+            for downloading_layer in self.progressInfo["downloading"]
+        )
+        is_rendering = self.progressInfo["range"] != len(self.progressInfo["rendered"])
+        if is_rendering and downloading:
+            stText = _("Rendering & downloading data {layers}...").format(
+                layers=downloading
+            )
+        elif is_rendering:
+            stText = _("Rendering...")
+        elif downloading:
+            stText = _("Downloading data {layers}...").format(layers=downloading)
+        else:
+            stText = ""
 
         self.updateProgress.emit(
             range=self.progressInfo["range"],

gui/wxpython/core/settings.py

@@ -1110,7 +1110,9 @@ def Set(self, group, value, key=None, subkey=None, settings_type="user"):
 
         except KeyError as e:
             raise GException(
-                "%s '%s:%s:%s'" % (_("Unable to set "), group, key, subkey)
+                _("Unable to set '{group}:{key}:{subkey}'").format(
+                    group=group, key=key, subkey=subkey
+                )
             ) from e
 
     def Append(self, dict, group, key, subkey, value, overwrite=True):

gui/wxpython/dbmgr/base.py

@@ -1184,9 +1184,7 @@ def AddLayer(self, layer, pos=-1):
 
         self.layerPage[layer] = {"browsePage": panel.GetId()}
 
-        label = _("Table")
-        if not self.dbMgrData["editable"]:
-            label += _(" (read-only)")
+        label = _("Table") if self.dbMgrData["editable"] else _("Table (read-only)")
 
         if pos == -1:
             pos = self.GetPageCount()
@@ -2329,9 +2327,7 @@ def AddLayer(self, layer, pos=-1):
         self.layerPage[layer] = {}
         panel = wx.Panel(parent=self, id=wx.ID_ANY)
         self.layerPage[layer]["tablePage"] = panel.GetId()
-        label = _("Table")
-        if not self.dbMgrData["editable"]:
-            label += _(" (read-only)")
+        label = _("Table") if self.dbMgrData["editable"] else _("Table (read-only)")
 
         if pos == -1:
             pos = self.GetPageCount()

gui/wxpython/gcp/manager.py

@@ -1724,14 +1724,17 @@ def _getOverWriteDialog(self, maptype, overwrite):
             map_name = "<{}>".format(found["name"])
 
         if found["name"] and not overwrite:
+            if maptype == "raster":
+                message = _(
+                    "The raster map {map_name} exists. Do you want to overwrite?"
+                ).format(map_name=map_name)
+            else:
+                message = _(
+                    "The vector map {map_name} exists. Do you want to overwrite?"
+                ).format(map_name=map_name)
             return wx.MessageDialog(
                 self.GetParent(),
-                message=_(
-                    "The {map_type} map {map_name} exists. Do you want to overwrite?"
-                ).format(
-                    map_type=maptype,
-                    map_name=map_name,
-                ),
+                message=message,
                 caption=_("Overwrite?"),
                 style=wx.YES_NO | wx.YES_DEFAULT | wx.ICON_QUESTION,
             )

gui/wxpython/gcp/toolbars.py

@@ -108,11 +108,8 @@ def __init__(self, parent, toolSwitcher):
 
         self.SetToolShortHelp(
             self.togglemap.GetId(),
-            "%s %s %s"
-            % (
-                _("Set map canvas for "),
-                BaseIcons["zoomBack"].GetLabel(),
-                _(" / Zoom to map"),
+            _("Set map canvas for {zoom_back} / Zoom to map").format(
+                zoom_back=BaseIcons["zoomBack"].GetLabel()
             ),
         )
 

gui/wxpython/gmodeler/model_items.py

@@ -880,7 +880,7 @@ def SetLabel(self, label=""):
     def GetLog(self):
         """Get log info"""
         if self.label:
-            return _("Condition: ") + self.label
+            return _("Condition: {label}").format(label=self.label)
         return _("Condition: not defined")
 
     def AddRelation(self, rel):

gui/wxpython/gui_core/forms.py

@@ -557,7 +557,7 @@ def __init__(
         guisizer.Add(self.notebookpanel, proportion=1, flag=wx.EXPAND)
 
         # status bar
-        status_text = _("Enter parameters for '") + self.task.name + "'"
+        status_text = _("Enter parameters for '{tool}'").format(tool=self.task.name)
         try:
             self.task.get_cmd()
             self.updateValuesHook()

gui/wxpython/gui_core/gselect.py

@@ -554,7 +554,7 @@ def _getElementList(self, element, mapsets=None, elements=None, exclude=False):
         first_mapset = None
         for mapset in mapsets:
             mapset_node = self.AddItem(
-                _("Mapset") + ": " + mapset, node=True, mapset=mapset
+                _("Mapset: {mapset}").format(mapset=mapset), node=True, mapset=mapset
             )
             node = mapset_node
             if not first_mapset:
@@ -567,7 +567,7 @@ def _getElementList(self, element, mapsets=None, elements=None, exclude=False):
                 if isinstance(filesdict[mapset], dict):
                     for elementType in filesdict[mapset].keys():
                         node = self.AddItem(
-                            _("Type: ") + elementType,
+                            _("Type: {element_type}").format(element_type=elementType),
                             mapset=mapset,
                             node=True,
                             parent=mapset_node,

gui/wxpython/gui_core/preferences.py

@@ -1559,7 +1559,7 @@ def _createLayersPage(self, notebook):
         randomColors = wx.CheckBox(
             parent=panel,
             id=wx.ID_ANY,
-            label=_("Random colors according to category number "),
+            label=_("Random colors according to category number"),
         )
         randomColors.SetValue(
             self.settings.Get(group="vectorLayer", key="randomColors", subkey="enabled")

gui/wxpython/iclass/toolbars.py

@@ -64,11 +64,8 @@ def __init__(self, parent, toolSwitcher):
 
         self.SetToolShortHelp(
             self.togglemap.GetId(),
-            "%s %s %s"
-            % (
-                _("Set map canvas for "),
-                BaseIcons["zoomBack"].GetLabel(),
-                _("/ Zoom to map"),
+            _("Set map canvas for {zoom_back} / Zoom to map").format(
+                zoom_back=BaseIcons["zoomBack"].GetLabel()
             ),
         )
 

gui/wxpython/image2target/ii2t_toolbars.py

@@ -108,11 +108,8 @@ def __init__(self, parent, toolSwitcher):
 
         self.SetToolShortHelp(
             self.togglemap.GetId(),
-            "%s %s %s"
-            % (
-                _("Set map canvas for "),
-                BaseIcons["zoomBack"].GetLabel(),
-                _(" / Zoom to map"),
+            _("Set map canvas for {zoom_back} / Zoom to map").format(
+                zoom_back=BaseIcons["zoomBack"].GetLabel()
             ),
         )
 

gui/wxpython/lmgr/layertree.py

@@ -1556,7 +1556,7 @@ def AddLayer(
         elif ltype == "group":
             # group item
             ctrl = None
-            grouptext = _("Layer group:") + str(self.groupnode)
+            grouptext = _("Layer group: {number}").format(number=self.groupnode)
             self.groupnode += 1
         else:
             btnbmp = LMIcons["layerOptions"].GetBitmap((16, 16))

gui/wxpython/mapwin/analysis.py

@@ -248,7 +248,9 @@ def Start(self):
         )
         if self._projInfo["proj"] != "xy":
             mapunits = self._projInfo["units"]
-            self._giface.WriteCmdLog(_("Measuring distance") + " (" + mapunits + "):")
+            self._giface.WriteCmdLog(
+                _("Measuring distance ({units}):").format(units=mapunits)
+            )
         else:
             self._giface.WriteCmdLog(_("Measuring distance:"))
 

gui/wxpython/photo2image/ip2i_toolbars.py

@@ -108,11 +108,8 @@ def __init__(self, parent, toolSwitcher):
 
         self.SetToolShortHelp(
             self.togglemap.GetId(),
-            "%s %s %s"
-            % (
-                _("Set map canvas for "),
-                BaseIcons["zoomBack"].GetLabel(),
-                _(" / Zoom to map"),
+            _("Set map canvas for {zoom_back} / Zoom to map").format(
+                zoom_back=BaseIcons["zoomBack"].GetLabel()
             ),
         )
 

gui/wxpython/psmap/dialogs.py

@@ -4987,7 +4987,7 @@ def _scalebarPanel(self):
         self.sbSegmentsCtrl = SpinCtrl(panel, id=wx.ID_ANY, min=1, max=30, initial=4)
         self.sbSegmentsCtrl.SetValue(self.scalebarDict["segment"])
 
-        sbLabelsText1 = StaticText(panel, id=wx.ID_ANY, label=_("Label every "))
+        sbLabelsText1 = StaticText(panel, id=wx.ID_ANY, label=_("Label every"))
         sbLabelsText2 = StaticText(panel, id=wx.ID_ANY, label=_("segments"))
         self.sbLabelsCtrl = SpinCtrl(panel, id=wx.ID_ANY, min=1, max=30, initial=1)
         self.sbLabelsCtrl.SetValue(self.scalebarDict["numbers"])

gui/wxpython/psmap/frame.py

@@ -2684,7 +2684,9 @@ def UpdateMapLabel(self):
             if not labelFiles:
                 return
             labelFiles = [lFile.split("@")[0] for lFile in labelFiles]
-            self.itemLabels[mapId].append(_("labels: ") + ", ".join(labelFiles))
+            self.itemLabels[mapId].append(
+                _("labels: {files}").format(files=", ".join(labelFiles))
+            )
 
     def UpdateLabel(self, itype, id):
         self.itemLabels[id] = []

gui/wxpython/rlisetup/wizard.py

@@ -1912,7 +1912,11 @@ def OnEnterPage(self, event: WizardEvent) -> None:
             GError(parent=self, message=_("The polygon seems to have 0 areas"))
             self.parent.wizard.ShowPage(self.parent.samplingareapage)
             return
-        self.title.SetLabel(_("Select sample area 1 of " + str(self.areanum)))
+        self.title.SetLabel(
+            _("Select sample area {areas_count} of {area_num}").format(
+                areas_count=1, area_num=self.areanum
+            )
+        )
         grass.use_temp_region()
         if self._raster != self.rast:
             self.map_ = self.mapPanel.GetMap()

gui/wxpython/tplot/frame.py

@@ -1017,7 +1017,9 @@ def OnRedraw(self, event=None):
                 GError(
                     parent=self,
                     showTraceback=False,
-                    message=_("Please change name of output CSV file or "),
+                    message=_(
+                        "Please change name of output CSV file or enable overwriting."
+                    ),
                 )
                 return
             dlg.Destroy()

gui/wxpython/wxplot/scatter.py

@@ -133,10 +133,7 @@ def OnSelectRaster(self, event):
     def SetupScatterplot(self):
         """Build data list for plotting each raster"""
 
-        #
-        # initialize title string
-        #
-        self.ptitle = _("Bivariate Scatterplot of ")
+        pair_labels = []
 
         #
         # create a datalist for plotting for each raster pair
@@ -148,26 +145,35 @@ def SetupScatterplot(self):
             self.raster[rpair]["datalist"] = self.CreateDatalist(rpair)
 
             # update title
-            self.ptitle += "%s vs %s, " % (
-                rpair[0].split("@")[0],
-                rpair[1].split("@")[0],
+            pair_labels.append(
+                _("{first} vs {second}").format(
+                    first=rpair[0].split("@")[0],
+                    second=rpair[1].split("@")[0],
+                )
             )
 
-        self.ptitle = self.ptitle.strip(", ")
+        self.ptitle = _("Bivariate Scatterplot of {pairs}").format(
+            pairs=", ".join(pair_labels)
+        )
 
         #
         # set xlabel & ylabel based on raster maps of first pair to be plotted
         #
-        self.xlabel = _("Raster <%s> cell values") % rpair[0].split("@")[0]
-        self.ylabel = _("Raster <%s> cell values") % rpair[1].split("@")[0]
-
-        units = self.raster[self.rasterList[0]][0]["units"]
-        if units != "":
-            self.xlabel += _(": %s") % units
+        self.xlabel = self._cell_values_label(
+            rpair[0].split("@")[0], self.raster[self.rasterList[0]][0]["units"]
+        )
+        self.ylabel = self._cell_values_label(
+            rpair[1].split("@")[0], self.raster[self.rasterList[0]][1]["units"]
+        )
 
-        units = self.raster[self.rasterList[0]][1]["units"]
+    @staticmethod
+    def _cell_values_label(raster, units):
+        """Return the axis label for the cell values of a raster map"""
         if units != "":
-            self.ylabel += _(": %s") % units
+            return _("Raster <{raster}> cell values: {units}").format(
+                raster=raster, units=units
+            )
+        return _("Raster <{raster}> cell values").format(raster=raster)
 
     def CreateDatalist(self, rpair):
         """Build a list of cell value, frequency pairs for histogram