From drjohnson11 at protonmail.com Sat Oct 5 16:20:06 2024 From: drjohnson11 at protonmail.com (drjohnson11) Date: Sat, 05 Oct 2024 23:20:06 +0000 Subject: [pmwiki-users] test Message-ID: test Sent with [Proton Mail](https://proton.me/mail/home) secure email. -------------- next part -------------- An HTML attachment was scrubbed... URL: From drjohnson11 at protonmail.com Sat Oct 5 16:33:51 2024 From: drjohnson11 at protonmail.com (drjohnson11) Date: Sat, 05 Oct 2024 23:33:51 +0000 Subject: [pmwiki-users] test2 Message-ID: test2

The White House

Sent with [Proton Mail](https://proton.me/mail/home) secure email. -------------- next part -------------- An HTML attachment was scrubbed... URL: From languefrancaise at gmail.com Sat Oct 19 18:06:19 2024 From: languefrancaise at gmail.com (ABClf) Date: Sun, 20 Oct 2024 03:06:19 +0200 Subject: [pmwiki-users] Issue with string $[This is a minor edit] in Site.EditForm Message-ID: 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. From 5ko at 5ko.fr Sat Oct 19 20:59:43 2024 From: 5ko at 5ko.fr (Petko Yotov) Date: Sun, 20 Oct 2024 05:59:43 +0200 Subject: [pmwiki-users] Issue with string $[This is a minor edit] in Site.EditForm In-Reply-To: References: Message-ID: <14625da46e84f9e7987677e3d52ba22b@5ko.fr> 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