Merge branch 'xwiki:master' into XWIKI-13967

xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/src/main/resources/XWiki/AdminTranslations.ko.xml

@@ -147,7 +147,7 @@ administration.section.analytics.status=상태
 administration.section.analytics.status.hint=Google Analytics™의 추적이 활성화되어 있는지 확인
 
 # Social category
-admin.social=사회의
+admin.social=소셜
 admin.social.description=소셜 기능에 대한 구성입니다.
 
 # Configurable Class

xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/src/main/resources/AppWithinMinutes/LiveTableViewSheet.xml

@@ -401,7 +401,8 @@ return XWiki;
  * Rename Application
  */
 require(['jquery', 'bootstrap', 'xwiki-form-validation-async'], function($) {
-  #set ($currentDocReference = $xwiki.getDocument($request.currentApp).getDocumentReference())
+  ## Note: if not currentApp request param is not passed, we default to the wiki home page reference to avoid a NPE
+  #set ($currentDocReference = $xwiki.getDocument("$!request.currentApp").getDocumentReference())
   // if we cannot find any extension related to this page app, it's not part of an extension.
   var isNotAnExtension = $services.extension.xar.getInstalledExtensions($currentDocReference).isEmpty();
 

xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/src/main/resources/Attachment/Picker/Code/Translations.ko.xml

@@ -37,7 +37,7 @@
   <syntaxId>plain/1.0</syntaxId>
   <hidden>true</hidden>
   <content>attachment.picker.ckeditor.pluginsImageSelector.title=갤러리
-attachment.picker.searchField.placeholder=찾다 ...
+attachment.picker.searchField.placeholder=찾기 ...
 attachment.picker.searchField.scope.currentPage=현재 페이지
 attachment.picker.searchField.scope.allPages=모든 페이지
 </content>

xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/Help/Code/Translations.ko.xml

@@ -165,7 +165,7 @@ help.templates.title=템플릿
 help.templates.useTemplates.description=템플릿은 새 페이지를 만들 때 복사할 수 있는 미리 정의된 페이지입니다.
 help.templates.useTemplates.tip=템플릿을 기반으로 {0}페이지를 생성{1}하면 사전 정의된 콘텐츠를 필요에 맞게 더 빠르게 조정할 수 있습니다.
 help.templates.useTemplates.title=템플릿 사용
-help.title=돕다
+help.title=도움말
 help.title1=XWiki를 사용하는 방법 ?
 help.title2=주요 XWiki 기능
 help.try.label=시도 해봐!

xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/pom.xml

@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.webjars.npm</groupId>
       <artifactId>vue</artifactId>
-      <version>2.7.15</version>
+      <version>2.7.16</version>
       <exclusions>
         <!-- Excluded because this dependency is 1) not used at runtime since all out components are pre-compiled 2) 
         not currently deployable on webjars.org (see https://github.com/webjars/webjars/issues/1976)  -->

xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/config/package.json

@@ -13,14 +13,14 @@
     "node": "20.10.0"
   },
   "dependencies": {
-    "vue": "2.7.15",
+    "vue": "2.7.16",
     "vue-i18n": "8.28.2",
     "lz-string": "1.5.0",
     "u-node": "0.0.2",
     "vuedraggable": "2.24.3",
     "vue-tippy": "4.16.0",
     "vue2-touch-events": "3.2.3",
-    "dompurify": "3.0.6"
+    "dompurify": "3.0.7"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "5.0.8",
@@ -32,7 +32,7 @@
     "eslint-plugin-vue": "9.19.2",
     "less": "4.2.0",
     "less-loader": "11.1.4",
-    "vue-template-compiler": "2.7.15",
+    "vue-template-compiler": "2.7.16",
     "@vue/test-utils": "1.3.6",
     "jquery": "3.7.1",
     "@testing-library/jest-dom": "5.17.0",

xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.ko.xml

@@ -76,7 +76,7 @@ notifications.filters.preferences.scopeNotificationFilter.wiki=일주일
 notifications.toggle.disabled.hint=이 위치를 보려면 설정에서 알림을 활성화해야 합니다
 
 ## Notifications formats
-notifications.format.alert=알리다
+notifications.format.alert=알림
 notifications.format.email=이메일
 
 ## Filter preferences settings

xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/ExportURLFactory.java

@@ -530,16 +530,18 @@ private URL createAttachmentURL(String filename, String spaces, String name, Str
         if (!file.exists()) {
             XWikiDocument doc = context.getWiki().getDocument(documentReference, context);
             XWikiAttachment attachment = doc.getAttachment(filename);
+            // If the attachment doesn't exist, then don't perform any action. It usually means that the
+            // createAttachmentURL() was called to get a URL, independently of whether it exists or not.
+            // This is the case for example in the Color Theme Sheet which uses:
+            //      $xwiki.getAttachmentURL($doc.fullName, '__tochange__')
+            // This clearly doesn't point to an existing attachment.
+            // In addition, it's possible that there's a link to a non-existing attachment and in this case we simply
+            // don't need to do anything (it'll lead to a broken link which is the correct outcome).
             if (attachment != null) {
                 file.getParentFile().mkdirs();
                 try (InputStream stream = attachment.getContentInputStream(context)) {
                     FileUtils.copyInputStreamToFile(stream, file);
                 }
-            } else {
-                Object[] args = {filename,  documentReference};
-                throw new XWikiException(XWikiException.MODULE_XWIKI_APP,
-                    XWikiException.ERROR_XWIKI_APP_ATTACHMENT_NOT_FOUND,
-                    "Attachment [{0}] not found for document [{1}]", null, args);
             }
         }
 

xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources_ko.properties

@@ -2226,7 +2226,7 @@ admin.main.title=\uAD00\uB9AC
 admin.switchContext=\uAC00\uB2E4
 
 ### categories
-admin.lf=\uB8E9\uC564\uD544
+admin.lf=\uB808\uC774\uC544\uC6C3
 admin.lf.description=\uC704\uD0A4\uC758 \uCE21\uBA74\uACFC \uB808\uC774\uC544\uC6C3\uC744 \uBCC0\uACBD\uD558\uC138\uC694.
 admin.usersgroups=\uC0AC\uC6A9\uC790 \uBC0F \uAD8C\uB9AC
 admin.usersgroups.description=\uC0AC\uC6A9\uC790, \uADF8\uB8F9 \uBC0F \uD574\uB2F9 \uC561\uC138\uC2A4 \uAD8C\uD55C\uC744 \uAD00\uB9AC\uD569\uB2C8\uB2E4.
@@ -2705,7 +2705,7 @@ xe.panels.edit=(\uC774 \uD328\uB110 \uD3B8\uC9D1)
 xe.panels.quicklinks=\uBE60\uB978 \uB9C1\uD06C
 xe.panels.quicklinks.dashboard=\uACC4\uAE30\uBC18
 xe.panels.quicklinks.index=\uD398\uC774\uC9C0 \uC0C9\uC778
-xe.panels.quicklinks.sandbox=\uBAA8\uB798 \uC0C1\uC790
+xe.panels.quicklinks.sandbox=\uC0CC\uB4DC\uBC15\uC2A4
 xe.panels.quicklinks.userdirectory=\uC0AC\uC6A9\uC790 \uBAA9\uB85D
 xe.panels.rights.welcome=\uAD8C\uB9AC \uD3B8\uC9D1\uC790\uC5D0 \uC624\uC2E0 \uAC83\uC744 \uD658\uC601\uD569\uB2C8\uB2E4.
 xe.panels.rights.explanation=\uD398\uC774\uC9C0\uC5D0 \uC801\uC6A9\uB41C \uAD8C\uD55C\uC740 \uACF5\uAC04\uC5D0 \uC801\uC6A9\uB41C \uAD8C\uD55C\uACFC \uC804\uCCB4 Wiki\uC5D0 \uC801\uC6A9\uB41C \uAD8C\uD55C\uC744 \uB300\uCCB4\uD569\uB2C8\uB2E4.
@@ -3442,22 +3442,22 @@ dashboard.actions.columns.add.tooltip=\uC774 \uB300\uC2DC\uBCF4\uB4DC \uC758 \uB
 ### Search application resources
 admin.searchsuggest=\uAC80\uC0C9 \uC81C\uC548
 admin.searchsuggest.description=\uAC80\uC0C9 \uC81C\uC548 \uC635\uC158\uC744 \uAD6C\uC131\uD569\uB2C8\uB2E4 .
-admin.search=\uCC3E\uB2E4
+admin.search=\uAC80\uC0C9
 admin.search.description=\uAE30\uBCF8 \uAC80\uC0C9 \uC5D4\uC9C4\uC744 \uC120\uD0DD\uD558\uAC70\uB098 \uAC80\uC0C9 \uC0C9\uC778\uC744 \uAD6C\uC131\uD558\uC138\uC694 .
-search.admin.title=\uCC3E\uB2E4
+search.admin.title=\uAC80\uC0C9
 search.admin.configuration.seexwikicfg=\uCD94\uAC00 \uAD6C\uC131 \uC635\uC158\uC740 xwiki .cfg \uD30C\uC77C\uC744 \uCC38\uC870\uD558\uC138\uC694 .
 search.admin.configuration.button=\uC800\uC7A5
 search.extension.title.database=\uB370\uC774\uD130 \uBCA0\uC774\uC2A4
 search.extension.title.solr=\uC194\uB974
 XWiki.SearchConfigClass_engine=\uAE30\uBCF8 \uAC80\uC0C9 \uC5D4\uC9C4
 search.page.title.query=\uAC80\uC0C9 : {0}
-search.page.title.noquery=\uCC3E\uB2E4
+search.page.title.noquery=\uAC80\uC0C9
 search.page.bar.spaces.title=\uC704\uCE58
 search.page.bar.wikis.all=\uBAA8\uB4E0 \uC704\uD0A4
-search.page.bar.query.tip=\uCC3E\uB2E4 ...
+search.page.bar.query.tip=\uAC80\uC0C9 ...
 search.page.bar.query.title=\uAC80\uC0C9\uC5B4 \uB97C \uC785\uB825\uD558\uC138\uC694
 search.page.bar.querytip=\uC608: xwiki * AND " \uAC80\uC0C9\uC5B4 "
-search.page.bar.submit=\uCC3E\uB2E4
+search.page.bar.submit=\uAC80\uC0C9
 search.page.bar.submit.title=\uAC80\uC0C9\uC5B4 _
 search.page.database.title.query=\uB370\uC774\uD130\uBCA0\uC774\uC2A4 \uAC80\uC0C9 : {0}
 search.page.database.title.noquery=\uB370\uC774\uD130\uBCA0\uC774\uC2A4 \uAC80\uC0C9
@@ -3692,7 +3692,7 @@ extensions.search.noResults=''{0}''\uACFC(\uC640) \uC77C\uCE58\uD558\uB294 \uD65
 extensions.advancedSearch.title=\uACE0\uAE09 \uAC80\uC0C9
 extensions.advancedSearch.id.label=\uD655\uC7A5 ID
 extensions.advancedSearch.version.label=\uBC84\uC804
-extensions.advancedSearch.actions.submit=\uCC3E\uB2E4
+extensions.advancedSearch.actions.submit=\uAC80\uC0C9
 extensions.advancedSearch.actions.cancel=\uCDE8\uC18C
 extensions.advancedSearch.noResults=ID\uAC00 ''{0}''\uC774\uACE0 \uBC84\uC804\uC774 ''{1}''\uC778 \uD655\uC7A5 \uD504\uB85C\uADF8\uB7A8\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uC62C\uBC14\uB978 \uD655\uC7A5 \uC800\uC7A5\uC18C\uAC00 \uAD6C\uC131\uB418\uC5B4 \uC788\uB294\uC9C0 \uD655\uC778\uD558\uC2ED\uC2DC\uC624.
 extensions.info.authors=\uC5D0 \uC758\uD574:
@@ -3861,11 +3861,11 @@ platform.extension.distributionWizard.extension.cleanStep.uninstall.finish.warni
 platform.extension.distributionWizard.extension.cleanStep.uninstall.finish.success=\uBD84\uB9AC\uB41C \uD655\uC7A5 \uD504\uB85C\uADF8\uB7A8\uC774 \uC131\uACF5\uC801\uC73C\uB85C \uC81C\uAC70\uB418\uC5C8\uC2B5\uB2C8\uB2E4
 
 ### Logging Application Resources
-admin.logging=\uBC8C\uCC44 \uBC18\uCD9C
+admin.logging=\uB85C\uAE45
 admin.logging.description=\uB4F1\uB85D\uB41C \uB85C\uAC70\uC640 \uAD00\uB828\uB41C \uB85C\uADF8 \uC218\uC900\uC744 \uAC80\uD1A0\uD558\uACE0 \uC218\uC815\uD569\uB2C8\uB2E4.
 logging.admin.intro=\uC5EC\uAE30\uC5D0\uC11C \uB4F1\uB85D\uB41C \uB85C\uAC70\uC640 \uAD00\uB828\uB41C \uB85C\uADF8 \uC218\uC900\uC744 \uAC80\uD1A0\uD558\uACE0 \uC218\uC815\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4. <default> \uB610\uB294 \uBE48 \uB85C\uADF8 \uC218\uC900\uC740 \uB85C\uAC70\uAC00 \uD328\uD0A4\uC9C0\uC778 \uACBD\uC6B0 \uD328\uD0A4\uC9C0 \uC811\uB450\uC0AC\uC778 \uC0C1\uC704 \uB85C\uAC70\uC5D0\uC11C \uC0C1\uC18D\uD558\uACE0, \uC0C1\uC704\uAC00 \uC5C6\uB294 \uACBD\uC6B0 \uB85C\uAC70 \uAD6C\uD604 \uAD6C\uC131\uC758 \uAE30\uBCF8 \uC218\uC900\uC744 \uC0C1\uC18D\uD55C\uB2E4\uB294 \uC758\uBBF8\uC785\uB2C8\uB2E4.
 logging.admin.livetable.actions.set=\uC138\uD2B8
-logging.admin.livetable.logger=\uB098\uBB34\uAFBC
+logging.admin.livetable.logger=\uB85C\uAC70
 logging.admin.livetable.level=\uC218\uC900
 logging.admin.livetable.actions=\uD589\uC704
 
@@ -3987,10 +3987,10 @@ xe.search.rebuild.failed=\uC778\uB371\uC2A4 \uC7AC\uAD6C\uCD95\uC5D0 \uC2E4\uD32
 xe.search.index.rebuild=\uB8E8\uC13C \uC778\uB371\uC2A4 \uC7AC\uAD6C\uC131
 xe.search.default.engine=\uAE30\uBCF8 \uAC80\uC0C9 \uC5D4\uC9C4
 xe.search.lucene.experimental=\uC774\uAC83\uC740 \uC0C8\uB85C\uC6B4 \uC2E4\uD5D8\uC801\uC778 Lucene \uAC80\uC0C9 \uC5D4\uC9C4\uC785\uB2C8\uB2E4. XWiki {0}\uB97C \uACC4\uC18D \uC0AC\uC6A9\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4 .
-panels.search.title=\uCC3E\uB2E4
+panels.search.title=\uAC80\uC0C9
 panels.search.query=\uAC80\uC0C9\uC5B4 _
 panels.search.inputLabel=\uCC3E\uB2E4
-panels.search.inputText=\uCC3E\uB2E4 ...
+panels.search.inputText=\uAC80\uC0C9 ...
 ### Missing: panels.search.submit=Go
 panels.search.advanced=\uACE0\uAE09 \uAC80\uC0C9
 ### Search
@@ -4004,20 +4004,20 @@ xe.search.page.previous=\uC774\uC804 \uD398\uC774\uC9C0
 ### Missing: xe.search.page.next=next page
 xe.search.plugin.notfound=Lucene \uD50C\uB7EC\uADF8\uC778\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. xwiki .cfg \uD30C\uC77C \uC5D0 \uC815\uC758\uB418\uC5B4 \uC788\uB294\uC9C0 \uD655\uC778\uD558\uC138\uC694 .
 xe.search.plugin.notenabled=Lucene \uD50C\uB7EC\uADF8\uC778 \uC774 \uD65C\uC131\uD654\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. XWiki {0}\uB97C \uC0AC\uC6A9\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4 .
-xe.search.go=\uCC3E\uB2E4
-xe.search.web=\uCC3E\uB2E4
+xe.search.go=\uAC80\uC0C9
+xe.search.web=\uAC80\uC0C9
 xe.search.web.results=\uAC80\uC0C9 : {0}
 xe.search.lucene=\uB8E8\uC52C \uAC80\uC0C9
 xe.search.lucene.results=\uB8E8\uC52C \uAC80\uC0C9 : {0}
 xe.search.rss={0} \uAC80\uC0C9\uC744 \uC704\uD55C RSS \uD53C\uB4DC
-xe.search.title=\uCC3E\uB2E4
-xe.search.bar.query.tip=\uCC3E\uB2E4 ...
+xe.search.title=\uAC80\uC0C9
+xe.search.bar.query.tip=\uAC80\uC0C9 ...
 xe.search.bar.query.title=\uAC80\uC0C9 \uCFFC\uB9AC \uC785\uB825
 xe.search.bar.wikis.all=\uBAA8\uB4E0 \uC704\uD0A4
 xe.search.bar.wikis.title=\uC704\uD0A4 \uC120\uD0DD
 xe.search.bar.spaces.title=\uACF5\uAC04 \uC120\uD0DD
 xe.search.bar.spaces.all=\uBAA8\uB4E0 \uACF5\uAC04
-xe.search.bar.submit=\uCC3E\uB2E4
+xe.search.bar.submit=\uAC80\uC0C9
 xe.search.bar.submit.title=\uAC80\uC0C9\uC5B4 _
 xe.search.bar.queryTip=\uC608: xwiki * AND " \uAC80\uC0C9\uC5B4 "
 xe.search.bar.advanced=\uACE0\uAE09