This is an automated email from the ASF dual-hosted git repository. alexoree pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 658760f951f6056104d5fb1ad7aa2ffc7e2b7ff7 Merge: af23f1fe6 c0df460ce Author: spyhunter99 <[email protected]> AuthorDate: Sun Dec 14 11:56:26 2025 -0500 Merge pull request #476 from spyhunter99/bug/JSPWIKI-1189-attempt2 JSPWIKI-1189 attempt2, fixes the restore/delete modal prompt when using the plain editor .../src/main/resources/templates/default.properties | 1 + .../src/main/resources/templates/default_de.properties | 1 + .../src/main/resources/templates/default_es.properties | 1 + .../src/main/resources/templates/default_fi.properties | 2 ++ .../src/main/resources/templates/default_fr.properties | 1 + .../src/main/resources/templates/default_it.properties | 3 +++ .../src/main/resources/templates/default_nl.properties | 1 + .../main/resources/templates/default_pt_BR.properties | 2 ++ .../src/main/resources/templates/default_ru.properties | 17 +++++++++++++++++ .../main/resources/templates/default_zh_CN.properties | 1 + .../test/java/org/apache/wiki/rss/RSSGeneratorTest.java | 7 +++---- .../src/main/scripts/moo-extend/Element.Extend.js | 7 ++++++- jspwiki-war/src/main/scripts/wiki-edit/Wiki.Edit.js | 16 +++++++++++++--- .../src/main/webapp/templates/default/editors/plain.jsp | 11 +++++++++-- 14 files changed, 61 insertions(+), 10 deletions(-)
