Bug 131125 - Improperly used ampersand
Summary: Improperly used ampersand
Status: VERIFIED FIXED
Alias: None
Product: LibreOffice
Classification: Unclassified
Component: Localization (show other bugs)
Version:
(earliest affected)
6.4.0.3 release
Hardware: All All
: medium normal
Assignee: Julien Nabet
URL:
Whiteboard: target:7.0.0
Keywords:
Depends on:
Blocks:
 
Reported: 2020-03-04 14:48 UTC by French.l10n
Modified: 2020-05-14 05:20 UTC (History)
4 users (show)

See Also:
Crash report or crash signature:


Attachments
Screenshot (109.46 KB, image/png)
2020-03-04 14:48 UTC, French.l10n
Details
solved here (111.51 KB, image/png)
2020-05-02 20:36 UTC, BogdanB
Details
but not here (113.50 KB, image/png)
2020-05-02 20:36 UTC, BogdanB
Details

Note You need to log in before you can comment on or make changes to this bug.
Description French.l10n 2020-03-04 14:48:46 UTC
Created attachment 158388 [details]
Screenshot

In French, just as in English, the ampersand should only be used according to typographical rules and is just not interchangeable with "et".

What we have:
Under the "Éditer" menu, we can find "Rechercher & remplacer".

What is expected:
The menu should rather read "Rechercher et remplacer"
Any such rogue ampersands should be replaced by "et" in the French UI.
Comment 1 Julien Nabet 2020-03-04 14:59:29 UTC
Sophie: I don't have opinion about this but noticed that was present in these files:
helpcontent2/source/text/scalc/guide.po
helpcontent2/source/text/shared/00.po
helpcontent2/source/text/shared/01.po
helpcontent2/source/text/shared/02.po
helpcontent2/source/text/shared/guide.po
helpcontent2/source/text/swriter/01.po
helpcontent2/source/text/swriter/guide.po
officecfg/registry/data/org/openoffice/Office/UI.po
svx/messages.po

I can do the changes in Weblate if it's ok for you.
Comment 2 sophie 2020-03-04 15:16:22 UTC
Hi Julien, thanks for the offer, that would be better to correct it in the sources because it's a wrong usage in en_US too. I agree that ampersand should not be used when it's not in its original meaning, so correcting it for all languages would be better. Sophie
Comment 3 Julien Nabet 2020-03-04 16:02:21 UTC
Found it in:
https://opengrok.libreoffice.org/xref/core/svx/uiconfig/ui/findreplacedialog.ui?r=f920e86f#8

Xisco: since even English part should be changed, does it need to be discussed with more people or can we submit a patch about this?
Comment 4 Xisco Faulí 2020-04-06 15:09:13 UTC
(In reply to Julien Nabet from comment #3)
> Found it in:
> https://opengrok.libreoffice.org/xref/core/svx/uiconfig/ui/findreplacedialog.
> ui?r=f920e86f#8
> 
> Xisco: since even English part should be changed, does it need to be
> discussed with more people or can we submit a patch about this?

I guess it's fine to go ahead and submit it, according to commit 2.
Assigning it to you
Comment 5 Julien Nabet 2020-04-06 21:01:41 UTC
Here's the patch:
https://gerrit.libreoffice.org/c/core/+/91785
Comment 6 Commit Notification 2020-04-07 09:36:56 UTC
Julien Nabet committed a patch related to this issue.
It has been pushed to "master":

https://git.libreoffice.org/core/commit/97db1d17be599c8627110cbb4f57f0cb36da178c

tdf#131125: Fix improperly used ampersand

It will be available in 7.0.0.

The patch should be included in the daily builds available at
https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
https://wiki.documentfoundation.org/Testing_Daily_Builds

Affected users are encouraged to test the fix and report feedback.
Comment 7 Julien Nabet 2020-04-07 09:50:44 UTC
Since on 6.4 the string freeze has been already been done, only next major release 7.0 will be fixed.
Let's put this one to FIXED then.
Comment 8 BogdanB 2020-05-02 20:36:05 UTC
Created attachment 160251 [details]
solved here
Comment 9 BogdanB 2020-05-02 20:36:44 UTC
Created attachment 160252 [details]
but not here

Version: 7.0.0.0.alpha0+
Build ID: 05b87ae66ebccd06995cf530b860443ad9503b31
CPU threads: 4; OS: Linux 5.4; UI render: default; VCL: gtk3; 
Locale: ro-RO (ro_RO.UTF-8); UI-Language: en-US
TinderBox: Linux-rpm_deb-x86_64@86-TDF, Branch:master, Time: 2020-05-02_10:14:58
Calc: threaded
Comment 10 BogdanB 2020-05-02 20:37:46 UTC
Was solved just in the Find and Replace window, but not in the Menu EDIT.
Comment 11 Julien Nabet 2020-05-02 20:56:25 UTC
Indeed, I had used git grep -n 'Find & Replace' but since it has a shortcut, I hadn't spotted it.
5426           <value xml:lang="en-US">Find and Rep~lace...</value>
See https://opengrok.libreoffice.org/xref/core/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu?r=7ae9c957#5426
Comment 12 Julien Nabet 2020-05-02 21:03:38 UTC
Hope I dealt with all of them with:
https://gerrit.libreoffice.org/c/core/+/93331
Comment 13 Commit Notification 2020-05-03 05:02:27 UTC
Julien Nabet committed a patch related to this issue.
It has been pushed to "master":

https://git.libreoffice.org/core/commit/18c97df0dcb348134d3ceac022a799338e02d7f5

Related tdf#131125: Improperly used ampersand

It will be available in 7.0.0.

The patch should be included in the daily builds available at
https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
https://wiki.documentfoundation.org/Testing_Daily_Builds

Affected users are encouraged to test the fix and report feedback.
Comment 14 BogdanB 2020-05-14 05:20:21 UTC
Verified in
Version: 7.0.0.0.alpha1+
Build ID: 47c81498c63ae71a351f43ec2f073ba92d99fc1d
CPU threads: 4; OS: Linux 5.4; UI render: default; VCL: gtk3; 
Locale: ro-RO (ro_RO.UTF-8); UI: en-US
TinderBox: Linux-rpm_deb-x86_64@86-TDF, Branch:master, Time: 2020-05-13_06:53:25
Calc: threaded

It's ok in Tips of the day, also in Search title, and Edit menu.