From 2452cbd4128a19da66e66e64f7771baceebdd078 Mon Sep 17 00:00:00 2001 From: Pierre Date: Thu, 14 Mar 2024 03:31:47 +0100 Subject: [PATCH] new version 1.2.1 --- README.md | 11 +++++-- README_fr.md | 11 +++++-- eMailerOOo.update.xml | 11 +++---- source/eMailerOOo/description.xml | 4 +-- .../pythonpath/emailer/merger/mergermodel.py | 29 ++++++++++--------- 5 files changed, 39 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 8c95ad45..a8a5dc78 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ **The use of this software subjects you to our [Terms Of Use][4] and [Data Protection Policy][5].** -# version [1.2.0][6] +# version [1.2.1][6] ## Introduction: @@ -405,7 +405,11 @@ ___ `pip install requirements.txt` - Modification of the [Requirement][90] section. -### What remains to be done for version 1.2.0: +### What has been done for version 1.2.1: + +- Integration of a fix to workaround the [issue #159988][91]. + +### What remains to be done for version 1.2.1: - Add new languages for internationalization... @@ -449,7 +453,7 @@ ___ [37]: [38]: [39]: -[40]: +[40]: [41]: [42]: [43]: @@ -500,3 +504,4 @@ ___ [88]: [89]: [90]: +[91]: diff --git a/README_fr.md b/README_fr.md index 2d9ac4be..8c43c7b5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ **L'utilisation de ce logiciel vous soumet à nos [Conditions d'utilisation][4] et à notre [Politique de protection des données][5].** -# version [1.2.0][6] +# version [1.2.1][6] ## Introduction: @@ -405,7 +405,11 @@ ___ `pip install requirements.txt` - Modification de la section [Prérequis][90]. -### Que reste-t-il à faire pour la version 1.2.0: +### Ce qui a été fait pour la version 1.2.1: + +- Intégration d'un correctif pour contourner le [dysfonctionnement #159988][91]. + +### Que reste-t-il à faire pour la version 1.2.1: - Ajouter de nouvelles langues pour l’internationalisation... @@ -449,7 +453,7 @@ ___ [37]: [38]: [39]: -[40]: +[40]: [41]: [42]: [43]: @@ -500,3 +504,4 @@ ___ [88]: [89]: [90]: +[91]: diff --git a/eMailerOOo.update.xml b/eMailerOOo.update.xml index ad184ab8..cf512e84 100644 --- a/eMailerOOo.update.xml +++ b/eMailerOOo.update.xml @@ -28,18 +28,19 @@ xmlns="http://openoffice.org/extensions/update/2006" xmlns:xlink="http://www.w3.org/1999/xlink"> - + - + - eMailerOOo + eMailerOOo + eMailerOOo - - + + diff --git a/source/eMailerOOo/description.xml b/source/eMailerOOo/description.xml index 6cb40e04..977b5810 100644 --- a/source/eMailerOOo/description.xml +++ b/source/eMailerOOo/description.xml @@ -25,14 +25,14 @@ ╚════════════════════════════════════════════════════════════════════════════════════╝ --> - + - + Send email in LibreOffice diff --git a/source/eMailerOOo/service/pythonpath/emailer/merger/mergermodel.py b/source/eMailerOOo/service/pythonpath/emailer/merger/mergermodel.py index e939e81f..59fce89b 100644 --- a/source/eMailerOOo/service/pythonpath/emailer/merger/mergermodel.py +++ b/source/eMailerOOo/service/pythonpath/emailer/merger/mergermodel.py @@ -101,7 +101,7 @@ def __init__(self, ctx, datasource): self._name = None self._labeler = None self._nominator = None - self._quoted = False + self._quoted = True self._quote = '' self._rows = () self._tables = {} @@ -117,18 +117,18 @@ def __init__(self, ctx, datasource): self._lock = Condition() self._service = 'com.sun.star.sdb.SingleSelectQueryComposer' self._url = getResourceLocation(ctx, g_identifier, g_extension) - self._resources = {'Step': 'MergerPage%s.Step', - 'Title': 'MergerPage%s.Title', - 'TabTitle': 'MergerTab%s.Title', - 'Progress': 'MergerPage1.Label6.Label.%s', - 'Error': 'MergerPage1.Label8.Label.%s', - 'Index': 'MergerPage1.Label14.Label.%s', - 'Query': 'MergerTab2.Label1.Label', - 'Recipient': 'MailWindow.Label4.Label', - 'PickerTitle': 'Mail.FilePicker.Title', - 'Property': 'Mail.Document.Property.%s', - 'Document': 'MailWindow.Label8.Label.1', - 'DialogTitle': 'MessageBox.Title', + self._resources = {'Step': 'MergerPage%s.Step', + 'Title': 'MergerPage%s.Title', + 'TabTitle': 'MergerTab%s.Title', + 'Progress': 'MergerPage1.Label6.Label.%s', + 'Error': 'MergerPage1.Label8.Label.%s', + 'Index': 'MergerPage1.Label14.Label.%s', + 'Query': 'MergerTab2.Label1.Label', + 'Recipient': 'MailWindow.Label4.Label', + 'PickerTitle': 'Mail.FilePicker.Title', + 'Property': 'Mail.Document.Property.%s', + 'Document': 'MailWindow.Label8.Label.1', + 'DialogTitle': 'MessageBox.Title', 'DialogMessage': 'MessageBox.Message'} @property @@ -254,7 +254,8 @@ def _setAddressBook(self, book, progress, setAddressBook): self._recipient.ActiveConnection = connection progress(80) self._queries = datasource.getQueryDefinitions() - self._quoted = connection.getMetaData().supportsMixedCaseQuotedIdentifiers() + # FIXME: SQLite need quoted identifier but don't supports mixed case quoted identifiers. + #self._quoted = connection.getMetaData().supportsMixedCaseQuotedIdentifiers() self._quote = connection.getMetaData().getIdentifierQuoteString() self._labeler = connection.getObjectNames() self._nominator = connection.createTableName()