aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouis Chemineau <louis@chmn.me>2023-09-21 16:40:14 +0200
committerLouis Chemineau <louis@chmn.me>2023-09-21 16:40:14 +0200
commitda56a43efb73ba9086889f33b348cd70e3389ca2 (patch)
tree3edaa4bbb2791b19a53ebcb2bbdbb15f2ba3f125
parent9610e1839a25705800cdd06943cb4911ea1795e9 (diff)
downloadnextcloud-server-artonge/debt/core_main.js.tar.gz
nextcloud-server-artonge/debt/core_main.js.zip
Signed-off-by: Louis Chemineau <louis@chmn.me>
-rw-r--r--apps/files_versions/src/components/Version.vue6
-rw-r--r--core/src/OCP/loader.js6
2 files changed, 7 insertions, 5 deletions
diff --git a/apps/files_versions/src/components/Version.vue b/apps/files_versions/src/components/Version.vue
index 20d7f584546..7376362995a 100644
--- a/apps/files_versions/src/components/Version.vue
+++ b/apps/files_versions/src/components/Version.vue
@@ -94,15 +94,15 @@
<form class="version-label-modal"
@submit.prevent="setVersionLabel(formVersionLabelValue)">
<label>
- <div class="version-label-modal__title">{{ t('photos', 'Version name') }}</div>
+ <div class="version-label-modal__title">{{ t('files_versions', 'Version name') }}</div>
<NcTextField ref="labelInput"
:value.sync="formVersionLabelValue"
- :placeholder="t('photos', 'Version name')"
+ :placeholder="t('files_versions', 'Version name')"
:label-outside="true" />
</label>
<div class="version-label-modal__info">
- {{ t('photos', 'Named versions are persisted, and excluded from automatic cleanups when your storage quota is full.') }}
+ {{ t('files_versions', 'Named versions are persisted, and excluded from automatic cleanups when your storage quota is full.') }}
</div>
<div class="version-label-modal__actions">
diff --git a/core/src/OCP/loader.js b/core/src/OCP/loader.js
index 6e58208a849..dbbbd288568 100644
--- a/core/src/OCP/loader.js
+++ b/core/src/OCP/loader.js
@@ -22,6 +22,8 @@
*
*/
+import { generateFilePath } from '@nextcloud/router'
+
const loadedScripts = {}
const loadedStylesheets = {}
/**
@@ -44,7 +46,7 @@ export default {
}
loadedScripts[key] = true
return new Promise(function(resolve, reject) {
- const scriptPath = OC.filePath(app, 'js', file)
+ const scriptPath = generateFilePath(app, 'js', file)
const script = document.createElement('script')
script.src = scriptPath
script.setAttribute('nonce', btoa(OC.requestToken))
@@ -68,7 +70,7 @@ export default {
}
loadedStylesheets[key] = true
return new Promise(function(resolve, reject) {
- const stylePath = OC.filePath(app, 'css', file)
+ const stylePath = generateFilePath(app, 'css', file)
const link = document.createElement('link')
link.href = stylePath
link.type = 'text/css'