[pmwiki-users] Issue with string $[This is a minor edit] in Site.EditForm

[Petko Yotov]

Indeed, sorry for my mistake:

   '(merge with previous edit)' is in 2.3.37
   ' (merge with previous edit)' will be in 2.3.38

(leading space before the parenthesis).

You could either wait for 2.3.38, or change this temporarily to remove 
the leading space, or add both definitions, with and without a leading 
space.

Petko


On 20/10/2024 17:45, ABClf wrote:
> Thank you Petko for the help,
> it's half fixed now.
> 
> I still have one unexpected light issue left ;
> one string of the label of the checkbox is not translated :
> 
>   Modification mineure (merge with previous edit)
> 
> The string /(merge with previous edit)/ is not translated (although
> the tooltip is well translated as expected) ;
> my XLPage looks ok ; and my Site.EditForm looks ok as well.
> 
> $[Author]: (:input e_author:) (:input e_minorcheckbox:)\\
> 
>   ' (merge with previous edit)' => ' (fusionner avec la modification
> précédente)',
>   'Merge the new edit with the last one, if by the same author, and
> reuse the change summary if left empty' => 'Fusionner la nouvelle
> modification avec la dernière, si elle est du même auteur, et
> réutiliser le résumé des modifications s'il est laissé vide',
> 
> Any idea what might be causing this ? all is fine on PmWiki/PmWikiFr.
> At the end I have copy-pasted PmWikiFr/XLPage and Site/EditForm from
> Pmwiki website, and I still can't get the string translated.
> Not a big issue but still strange to me.
> 
> Thank you,
> Gilles.
> 
> Le dim. 20 oct. 2024 à 05:59, Petko Yotov <5ko at 5ko.fr> a écrit :
>> 
>> Just remove the label from Site.EditForm.
>> 
>> The "minor checkbox" label is now part of the (:input 
>> e_minorcheckbox:)
>> markup, and may be modified automatically, notably when merging edits.
>> 
>> Note that the page Site.EditForm has been modified, if you have
>> customized it, you may want to edit this page and after (:input
>> e_minorcheckbox:) remove the text "$[This is a minor edit]".
>> 
>>    https://www.pmwiki.org/wiki/PmWiki/ReleaseNotes#v2337
>>    https://www.pmwiki.org/wiki/PmWiki/Upgrades#v2337
>>    
>> https://www.pmwiki.org/pipermail/pmwiki-users/2024-August/065349.html
>> 
>> PmWiki ships with Site.EditForm and other Site pages in wikilib.d, but
>> when you modify one, it is copied to wiki.d so that on the next 
>> upgrade
>> you don't lose your changes. Unfortunately, if the core modifies the
>> core page, your custom version is still shown, so you may need to
>> manually update it.
>> 
>> I find the merging of consecutive minor edits by the same writer very
>> useful. It keeps a neat page history, which is good both for the 
>> writer
>> and for the reviewers. When merging is available, the label will be
>> changed to "This is a minor edit (merge with previous edit)" and there
>> will be a tooltip title.
>> 
>> 
>> https://www.pmwiki.org/wiki/PmWiki/EditVariables#EnableMergeLastMinorEdit
>> 
>> In addition to the above, the label is now an actual <label> element 
>> and
>> you can click on it to toggle the checkbox.
>> 
>> For these reasons, it felt acceptable to me to modify the EditForm and
>> document the changes, even if some admins may need to update their
>> customized forms.
>> 
>> International wikis may also update their XLPage with the new strings,
>> for example:
>> 
>>    ' (merge with previous edit)' => ' (fusionner avec la modification
>> précédente)',
>> 
>>    'Merge the new edit with the last one, if by the same author, and
>> reuse the change summary if left empty' => 'Fusionner la nouvelle
>> modification avec la dernière, si elle est du même auteur, et 
>> réutiliser
>> le résumé des modifications s'il est laissé vide',
>> 
>> These could probably be simplified.
>> 
>> Petko
>> 
>> --
>> If you upgrade :  https://www.pmwiki.org/Upgrades
>> 
>> On 20/10/2024 03:06, ABClf wrote:
>> > Hello,
>> >
>> > (I'm using last pmwiki version)
>> >
>> > What might be the reason why I get the string /This is a minor edit/
>> > translated two times rather than only one in the edit form ?
>> >
>> > Auteur: (field for author) (checkbox)  Modification mineure
>> > Modification mineure
>> >
>> > In config, line with XL string are :
>> > XLPage('fr','PmWikiFr.XLPage');
>> > XLPage('fr','PmWikiFr.XLPageCookbook'); // S'il y a des modules
>> >
>> > In Site/EditForm, line is :
>> > $[Author]: (:input e_author:) (:input e_minorcheckbox:) $[This is a
>> > minor edit]\\
>> >
>> > In PmWikiFr/XLPage, line is :
>> >   'This is a minor edit' => 'Modification mineure',
>> >
>> > Any advice ? Isn't that related to recent merging diff option ? I can
>> > not find how to get back to expected behaviour.
>> >
>> > Thank you,
>> > Gilles.