fix processing plugin main translation and add translations

for toplevel toolbox entries (fixes #12168)
qgis · Feb 13, 2015 · 4a44956 · 4a44956
1 parent 0a51260
commit 4a44956
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 12 deletions.
diff --git a/python/plugins/processing/ProcessingPlugin.py b/python/plugins/processing/ProcessingPlugin.py
@@ -156,4 +156,4 @@ def openConfig(self):
         dlg.exec_()
 
     def tr(self, message):
-        return QCoreApplication.translate('Processing', message)
+        return QCoreApplication.translate('ProcessingPlugin', message)
diff --git a/python/plugins/processing/algs/gdal/GdalOgrAlgorithmProvider.py b/python/plugins/processing/algs/gdal/GdalOgrAlgorithmProvider.py
@@ -100,7 +100,7 @@ def scriptsFolder(self):
         return os.path.dirname(__file__) + '/scripts'
 
     def getDescription(self):
-        return 'GDAL/OGR'
+        return self.tr('GDAL/OGR')
 
     def getName(self):
         return 'gdalogr'

diff --git a/python/plugins/processing/algs/grass/GrassAlgorithmProvider.py b/python/plugins/processing/algs/grass/GrassAlgorithmProvider.py
@@ -88,7 +88,7 @@ def _loadAlgorithms(self):
         self.algs = self.preloadedAlgs
 
     def getDescription(self):
-        return 'GRASS commands'
+        return self.tr('GRASS commands')
 
     def getName(self):
         return 'grass'

diff --git a/python/plugins/processing/algs/grass7/Grass7AlgorithmProvider.py b/python/plugins/processing/algs/grass7/Grass7AlgorithmProvider.py
@@ -93,7 +93,7 @@ def _loadAlgorithms(self):
         self.algs = self.preloadedAlgs
 
     def getDescription(self):
-        return 'GRASS GIS 7 commands'
+        return self.tr('GRASS GIS 7 commands')
 
     def getName(self):
         return 'grass70'

diff --git a/python/plugins/processing/algs/lidar/LidarToolsAlgorithmProvider.py b/python/plugins/processing/algs/lidar/LidarToolsAlgorithmProvider.py
@@ -223,7 +223,7 @@ def getName(self):
         return 'lidartools'
 
     def getDescription(self):
-        return 'Tools for LiDAR data'
+        return self.tr('Tools for LiDAR data')
 
     def getIcon(self):
         return QIcon(os.path.dirname(__file__) + '/../../images/tool.png')

diff --git a/python/plugins/processing/algs/otb/OTBAlgorithmProvider.py b/python/plugins/processing/algs/otb/OTBAlgorithmProvider.py
@@ -45,7 +45,7 @@ def __init__(self):
 
 
     def getDescription(self):
-        return "Orfeo Toolbox (Image analysis)"
+        return self.tr("Orfeo Toolbox (Image analysis)")
 
     def getName(self):
         return "otb"

diff --git a/python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py b/python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py
@@ -207,7 +207,7 @@ def getName(self):
         return 'qgis'
 
     def getDescription(self):
-        return 'QGIS geoalgorithms'
+        return self.tr('QGIS geoalgorithms')
 
     def getIcon(self):
         return self._icon

diff --git a/python/plugins/processing/algs/taudem/TauDEMAlgorithmProvider.py b/python/plugins/processing/algs/taudem/TauDEMAlgorithmProvider.py
@@ -54,7 +54,7 @@ def __init__(self):
         self.createAlgsList()
 
     def getDescription(self):
-        return 'TauDEM (hydrologic analysis)'
+        return self.tr('TauDEM (hydrologic analysis)')
 
     def getName(self):
         return 'taudem'

diff --git a/python/plugins/processing/gui/ProcessingToolbox.py b/python/plugins/processing/gui/ProcessingToolbox.py
@@ -26,7 +26,7 @@
 
 __revision__ = '$Format:%H$'
 
-from PyQt4.QtCore import Qt, QSettings
+from PyQt4.QtCore import Qt, QSettings, QCoreApplication
 from PyQt4.QtGui import QDockWidget, QMenu, QAction, QTreeWidgetItem
 from qgis.utils import iface
 from processing.modeler.ModelerUtils import ModelerUtils
@@ -404,7 +404,7 @@ def populate(self):
             groupItem.addChild(algItem)
 
         self.setText(0, self.provider.getDescription()
-                    + ' [' + str(count) + ' geoalgorithms]')
+                  + QCoreApplication.translate( "TreeProviderItem", " [{0} geoalgorithms]" ).format( count ) )
         self.setToolTip(0, self.text(0))
         for groupItem in groups.values():
             self.addChild(groupItem)
diff --git a/scripts/update_ts_files.sh b/scripts/update_ts_files.sh
@@ -21,8 +21,7 @@
 # Note the .pro file must NOT be named qgis.pro as this
 # name is reserved for the Windows qmake project file
 
-echo "deprecated - use push_ts.sh and pull_ts.sh"
-exit 1
+echo "deprecated - use push_ts.sh and pull_ts.sh" >&2
 
 set -e