Skip to content

Commit 2452cbd

Browse files
prrvchrprrvchr
committed
new version 1.2.1
1 parent 16f83f6 commit 2452cbd

File tree

5 files changed

+39
-27
lines changed

5 files changed

+39
-27
lines changed

‎README.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
**The use of this software subjects you to our [Terms Of Use][4] and [Data Protection Policy][5].**
3131

32-
# version [1.2.0][6]
32+
# version [1.2.1][6]
3333

3434
## Introduction:
3535

@@ -405,7 +405,11 @@ ___
405405
`pip install requirements.txt`
406406
- Modification of the [Requirement][90] section.
407407

408-
### What remains to be done for version 1.2.0:
408+
### What has been done for version 1.2.1:
409+
410+
- Integration of a fix to workaround the [issue #159988][91].
411+
412+
### What remains to be done for version 1.2.1:
409413

410414
- Add new languages for internationalization...
411415

@@ -449,7 +453,7 @@ ___
449453
[37]: <https://img.shields.io/github/v/tag/prrvchr/mContactOOo?label=latest#right>
450454
[38]: <https://prrvchr.github.io/eMailerOOo/img/eMailerOOo.svg#middle>
451455
[39]: <https://github.com/prrvchr/eMailerOOo/releases/latest/download/eMailerOOo.oxt>
452-
[40]: <https://img.shields.io/github/downloads/prrvchr/eMailerOOo/latest/total?label=v1.2.0#right>
456+
[40]: <https://img.shields.io/github/downloads/prrvchr/eMailerOOo/latest/total?label=v1.2.1#right>
453457
[41]: <https://prrvchr.github.io/eMailerOOo/#merge-emails-with-mailing-lists>
454458
[42]: <https://prrvchr.github.io/eMailerOOo/#configure-connection>
455459
[43]: <https://prrvchr.github.io/eMailerOOo/#outgoing-emails>
@@ -500,3 +504,4 @@ ___
500504
[88]: <https://github.com/prrvchr/eMailerOOo/releases/latest/download/requirements.txt>
501505
[89]: <https://peps.python.org/pep-0508/>
502506
[90]: <https://prrvchr.github.io/eMailerOOo/#requirement>
507+
[91]: <https://bugs.documentfoundation.org/show_bug.cgi?id=159988>

‎README_fr.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
**L'utilisation de ce logiciel vous soumet à nos [Conditions d'utilisation][4] et à notre [Politique de protection des données][5].**
3131

32-
# version [1.2.0][6]
32+
# version [1.2.1][6]
3333

3434
## Introduction:
3535

@@ -405,7 +405,11 @@ ___
405405
`pip install requirements.txt`
406406
- Modification de la section [Prérequis][90].
407407

408-
### Que reste-t-il à faire pour la version 1.2.0:
408+
### Ce qui a été fait pour la version 1.2.1:
409+
410+
- Intégration d'un correctif pour contourner le [dysfonctionnement #159988][91].
411+
412+
### Que reste-t-il à faire pour la version 1.2.1:
409413

410414
- Ajouter de nouvelles langues pour l’internationalisation...
411415

@@ -449,7 +453,7 @@ ___
449453
[37]: <https://img.shields.io/github/v/tag/prrvchr/mContactOOo?label=latest#right>
450454
[38]: <https://prrvchr.github.io/eMailerOOo/img/eMailerOOo.svg#middle>
451455
[39]: <https://github.com/prrvchr/eMailerOOo/releases/latest/download/eMailerOOo.oxt>
452-
[40]: <https://img.shields.io/github/downloads/prrvchr/eMailerOOo/latest/total?label=v1.2.0#right>
456+
[40]: <https://img.shields.io/github/downloads/prrvchr/eMailerOOo/latest/total?label=v1.2.1#right>
453457
[41]: <https://prrvchr.github.io/eMailerOOo/README_fr#publipostage-de-courriels-avec-des-listes-de-diffusion>
454458
[42]: <https://prrvchr.github.io/eMailerOOo/README_fr#configuration-de-la-connexion>
455459
[43]: <https://prrvchr.github.io/eMailerOOo/README_fr#courriels-sortants>
@@ -500,3 +504,4 @@ ___
500504
[88]: <https://github.com/prrvchr/eMailerOOo/releases/latest/download/requirements.txt>
501505
[89]: <https://peps.python.org/pep-0508/>
502506
[90]: <https://prrvchr.github.io/eMailerOOo/README_fr#pr%C3%A9requis>
507+
[91]: <https://bugs.documentfoundation.org/show_bug.cgi?id=159988>

‎eMailerOOo.update.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,19 @@
2828
xmlns="http://openoffice.org/extensions/update/2006"
2929
xmlns:xlink="http://www.w3.org/1999/xlink">
3030
<identifier value="io.github.prrvchr.eMailerOOo"/>
31-
<version value="1.2.0" />
31+
<version value="1.2.1"/>
3232
<update-download>
3333
<src xlink:href="https://github.com/prrvchr/eMailerOOo/releases/latest/download/eMailerOOo.oxt"/>
3434
</update-download>
3535
<dependencies xmlns:dep="http://openoffice.org/extensions/description/2006">
36-
<dep:OpenOffice.org-minimal-version value="4.0" dep:name="OpenOffice.org 4.0"/>
36+
<dep:OpenOffice.org-minimal-version value="4.1" dep:name="OpenOffice.org 4.1"/>
3737
</dependencies>
3838
<publisher>
39-
<name xlink:href="https://github.com/prrvchr/eMailerOOo" lang="en">eMailerOOo</name>
39+
<name xlink:href="https://prrvchr.github.io/eMailerOOo/" lang="en">eMailerOOo</name>
40+
<name xlink:href="https://prrvchr.github.io/eMailerOOo/README_fr" lang="fr">eMailerOOo</name>
4041
</publisher>
4142
<release-notes>
42-
<src xlink:href="https://prrvchr.github.io/eMailerOOo/#historical" lang="en" />
43-
<src xlink:href="https://prrvchr.github.io/eMailerOOo/README_fr#historique" lang="fr" />
43+
<src xlink:href="https://prrvchr.github.io/eMailerOOo/#what-has-been-done-for-version-121" lang="en"/>
44+
<src xlink:href="https://prrvchr.github.io/eMailerOOo/README_fr#ce-qui-a-%C3%A9t%C3%A9-fait-pour-la-version-121" lang="fr"/>
4445
</release-notes>
4546
</description>

‎source/eMailerOOo/description.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
╚════════════════════════════════════════════════════════════════════════════════════╝
2626
-->
2727
<description xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink">
28-
<version value="1.2.0"/>
28+
<version value="1.2.1"/>
2929
<identifier value="io.github.prrvchr.eMailerOOo"/>
3030
<platform value="all"/>
3131
<dependencies>
3232
<OpenOffice.org-minimal-version value="4.1" d:name="OpenOffice.org 4.1"/>
3333
</dependencies>
3434
<update-information>
35-
<src xlink:href="https://prrvchr.github.io/eMailerOOo/eMailerOOo.update.xml"/>
35+
<src xlink:href="https://github.com/prrvchr/eMailerOOo/releases/latest/download/eMailerOOo.update.xml"/>
3636
</update-information>
3737
<publisher>
3838
<name xlink:href="https://prrvchr.github.io/eMailerOOo/" lang="en">Send email in LibreOffice</name>

‎source/eMailerOOo/service/pythonpath/emailer/merger/mergermodel.py

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def __init__(self, ctx, datasource):
101101
self._name = None
102102
self._labeler = None
103103
self._nominator = None
104-
self._quoted = False
104+
self._quoted = True
105105
self._quote = ''
106106
self._rows = ()
107107
self._tables = {}
@@ -117,18 +117,18 @@ def __init__(self, ctx, datasource):
117117
self._lock = Condition()
118118
self._service = 'com.sun.star.sdb.SingleSelectQueryComposer'
119119
self._url = getResourceLocation(ctx, g_identifier, g_extension)
120-
self._resources = {'Step': 'MergerPage%s.Step',
121-
'Title': 'MergerPage%s.Title',
122-
'TabTitle': 'MergerTab%s.Title',
123-
'Progress': 'MergerPage1.Label6.Label.%s',
124-
'Error': 'MergerPage1.Label8.Label.%s',
125-
'Index': 'MergerPage1.Label14.Label.%s',
126-
'Query': 'MergerTab2.Label1.Label',
127-
'Recipient': 'MailWindow.Label4.Label',
128-
'PickerTitle': 'Mail.FilePicker.Title',
129-
'Property': 'Mail.Document.Property.%s',
130-
'Document': 'MailWindow.Label8.Label.1',
131-
'DialogTitle': 'MessageBox.Title',
120+
self._resources = {'Step': 'MergerPage%s.Step',
121+
'Title': 'MergerPage%s.Title',
122+
'TabTitle': 'MergerTab%s.Title',
123+
'Progress': 'MergerPage1.Label6.Label.%s',
124+
'Error': 'MergerPage1.Label8.Label.%s',
125+
'Index': 'MergerPage1.Label14.Label.%s',
126+
'Query': 'MergerTab2.Label1.Label',
127+
'Recipient': 'MailWindow.Label4.Label',
128+
'PickerTitle': 'Mail.FilePicker.Title',
129+
'Property': 'Mail.Document.Property.%s',
130+
'Document': 'MailWindow.Label8.Label.1',
131+
'DialogTitle': 'MessageBox.Title',
132132
'DialogMessage': 'MessageBox.Message'}
133133

134134
@property
@@ -254,7 +254,8 @@ def _setAddressBook(self, book, progress, setAddressBook):
254254
self._recipient.ActiveConnection = connection
255255
progress(80)
256256
self._queries = datasource.getQueryDefinitions()
257-
self._quoted = connection.getMetaData().supportsMixedCaseQuotedIdentifiers()
257+
# FIXME: SQLite need quoted identifier but don't supports mixed case quoted identifiers.
258+
#self._quoted = connection.getMetaData().supportsMixedCaseQuotedIdentifiers()
258259
self._quote = connection.getMetaData().getIdentifierQuoteString()
259260
self._labeler = connection.getObjectNames()
260261
self._nominator = connection.createTableName()

0 commit comments

Comments
 (0)