From afb31e66a5c17cf9022f7def8376b4a7f8751eb3 Mon Sep 17 00:00:00 2001 From: Tom Kralidis Date: Wed, 2 Oct 2024 06:21:11 -0400 Subject: [PATCH] do not translate log messages --- python/plugins/MetaSearch/plugin.py | 9 ++-- python/plugins/MetaSearch/search_backend.py | 56 +++++++-------------- 2 files changed, 21 insertions(+), 44 deletions(-) diff --git a/python/plugins/MetaSearch/plugin.py b/python/plugins/MetaSearch/plugin.py index 2c8406251d89..6f2b778c7a96 100644 --- a/python/plugins/MetaSearch/plugin.py +++ b/python/plugins/MetaSearch/plugin.py @@ -50,8 +50,7 @@ def initGui(self): """startup""" # run - log_message(QCoreApplication.translate( - 'MetaSearch', 'Initializing plugin'), Qgis.Info) + log_message('Initializing plugin', Qgis.Info) run_icon = QIcon('{}/{}'.format(self.context.ppath, 'images/MetaSearch.svg')) self.action_run = QAction(run_icon, 'MetaSearch', @@ -83,8 +82,7 @@ def initGui(self): def unload(self): """teardown""" - log_message(QCoreApplication.translate( - 'MetaSearch', 'Unloading plugin'), Qgis.Info) + log_message('Unloading plugin', Qgis.Info) # remove the plugin menu item and icon self.iface.removePluginWebMenu(self.web_menu, self.action_run) @@ -94,8 +92,7 @@ def unload(self): def run(self): """open MetaSearch""" - log_message(QCoreApplication.translate( - 'MetaSearch', 'Running plugin'), Qgis.Info) + log_message('Running plugin', Qgis.Info) self.dialog.exec() diff --git a/python/plugins/MetaSearch/search_backend.py b/python/plugins/MetaSearch/search_backend.py index 8684405bc691..73fbbb4566ff 100644 --- a/python/plugins/MetaSearch/search_backend.py +++ b/python/plugins/MetaSearch/search_backend.py @@ -35,7 +35,6 @@ from owslib.csw import CatalogueServiceWeb # spellok from qgis.core import Qgis -from qgis.PyQt.QtCore import QCoreApplication if owslib.__version__ < '0.25': OWSLIB_OAREC_SUPPORTED = False @@ -89,8 +88,7 @@ def __init__(self, url, timeout, username, password, auth): self.record_info_template = 'record_metadata_dc.html' self.constraints = [] - log_message(QCoreApplication.translate( - 'MetaSearch', f'Connecting to CSW: {self.url}'), Qgis.Info) + log_message(f'Connecting to CSW: {self.url}', Qgis.Info) self.conn = CatalogueServiceWeb(self.url, # spellok timeout=self.timeout, username=self.username, @@ -108,8 +106,7 @@ def query_records(self, bbox=[], keywords=None, limit=10, offset=1): # even for a global bbox, if a spatial filter is applied, then # the CSW server will skip records without a bbox if bbox and bbox != ['-180', '-90', '180', '90']: - log_message(QCoreApplication.translate( - 'MetaSearch', f'Setting bbox filter ({bbox})'), Qgis.Info) + log_message(f'Setting bbox filter ({bbox})', Qgis.Info) minx, miny, maxx, maxy = bbox self.constraints.append(BBox([miny, minx, maxy, maxx], crs='urn:ogc:def:crs:EPSG::4326')) @@ -117,25 +114,20 @@ def query_records(self, bbox=[], keywords=None, limit=10, offset=1): # keywords if keywords: # TODO: handle multiple word searches - log_message(QCoreApplication.translate( - 'MetaSearch', f'Setting csw:AnyText filter {keywords}'), - Qgis.Info) + log_message(f'Setting csw:AnyText filter {keywords}', Qgis.Info) self.constraints.append(PropertyIsLike('csw:AnyText', keywords)) if len(self.constraints) > 1: # exclusive search (a && b) self.constraints = [self.constraints] - log_message(QCoreApplication.translate( - 'MetaSearch', f'Searching CSW: {self.url}'), Qgis.Info) + log_message('Searching CSW: {self.url}', Qgis.Info) self.conn.getrecords2(constraints=self.constraints, maxrecords=limit, startposition=offset, esn='full') self.matches = self.conn.results['matches'] self.returned = self.conn.results['returned'] - log_message(QCoreApplication.translate( - 'MetaSearch', f'Matches: {self.matches}'), Qgis.Info) - log_message(QCoreApplication.translate( - 'MetaSearch', f'Returned: {self.returned}'), Qgis.Info) + log_message(f'Matches: {self.matches}', Qgis.Info) + log_message(f'Returned: {self.returned}', Qgis.Info) self.request = self.conn.request self.response = self.conn.response @@ -169,9 +161,7 @@ def records(self): return recs def get_record(self, identifier): - log_message(QCoreApplication.translate( - 'MetaSearch', f'Searching CSW for record: {identifier}'), - Qgis.Info) + log_message(f'Searching CSW for record: {identifier}', Qgis.Info) self.conn.getrecordbyid([identifier]) return self.conn.records[identifier] @@ -195,8 +185,7 @@ def __init__(self, url, timeout, auth): self.record_collection = None if '/collections/' in self.url: # catalog is a collection - log_message(QCoreApplication.translate( - 'MetaSearch', 'OARec endpoint is a collection'), Qgis.Info) + log_message('OARec endpoint is a collection', Qgis.Info) self.base_url, self.record_collection = self.url.split('/collections/') # noqa self.conn = Records( self.base_url, timeout=self.timeout, auth=self.auth) @@ -209,8 +198,7 @@ def __init__(self, url, timeout, auth): pass self.request = self.conn.request else: - log_message(QCoreApplication.translate( - 'MetaSearch', 'OARec endpoint is not a collection'), Qgis.Info) + log_message('OARec endpoint is not a collection', Qgis.Info) self.conn = Records(self.url, timeout=self.timeout, auth=self.auth) self.request = None @@ -228,26 +216,21 @@ def query_records(self, bbox=[], keywords=None, limit=10, offset=1): } if keywords: - log_message(QCoreApplication.translate( - 'MetaSearch', f'Setting keyword search {keywords}'), Qgis.Info) + log_message(f'Setting keyword search {keywords}', Qgis.Info) params['q'] = keywords if bbox and bbox != ['-180', '-90', '180', '90']: - log_message(QCoreApplication.translate( - 'MetaSearch', f'Setting bbox search {bbox}'), Qgis.Info) + log_message(f'Setting bbox search {bbox}', Qgis.Info) params['bbox'] = bbox - log_message(QCoreApplication.translate( - 'MetaSearch', f'Searching OARec: {self.url}'), Qgis.Info) + log_message(f'Searching OARec: {self.url}', Qgis.Info) self.response = self.conn.collection_items(**params) self.matches = self.response.get('numberMatched', 0) self.returned = self.response.get('numberReturned', 0) self.request = self.conn.request - log_message(QCoreApplication.translate( - 'MetaSearch', f'Matches: {self.matches}'), Qgis.Info) - log_message(QCoreApplication.translate( - 'MetaSearch', f'Returned: {self.returned}'), Qgis.Info) + log_message(f'Matches: {self.matches}', Qgis.Info) + log_message(f'Returned: {self.returned}', Qgis.Info) def records(self): recs = [] @@ -276,9 +259,8 @@ def records(self): return recs def get_record(self, identifier): - log_message(QCoreApplication.translate( - 'MetaSearch', f'Searching OARec endpoint for item {identifier}'), - Qgis.Info) + log_message(f'Searching OARec endpoint for item {identifier}', + Qgis.Info) return self.conn.collection_item(self.record_collection, identifier) def parse_link(self, link): @@ -297,12 +279,10 @@ def parse_link(self, link): def get_catalog_service(url, catalog_type, timeout, username, password, auth=None): if catalog_type in [None, CATALOG_TYPES[0]]: - log_message(QCoreApplication.translate( - 'MetaSearch', 'CSW endpoint detected'), Qgis.Info) + log_message('CSW endpoint detected', Qgis.Info) return CSW202Search(url, timeout, username, password, auth) elif catalog_type == CATALOG_TYPES[1]: - log_message(QCoreApplication.translate( - 'MetaSearch', 'OARec endpoint detected'), Qgis.Info) + log_message('OARec endpoint detected', Qgis.Info) if not OWSLIB_OAREC_SUPPORTED: raise ValueError("OGC API - Records requires OWSLib 0.25 or above") return OARecSearch(url, timeout, auth)