Skip to content

Commit 3f922df

Browse files
susnuxsusnux
committed
fixup! fixup
1 parent 82cf6b4 commit 3f922df

29 files changed

+167
-559
lines changed

‎apps/appstore/src/components/AppLevelBadge.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ const props = defineProps<{
2929
const isSupported = computed(() => props.level === 300)
3030
const isFeatured = computed(() => props.level === 200)
3131
const badgeIcon = computed(() => isSupported.value ? mdiStarShootingOutline : mdiCheck)
32-
const badgeText = computed(() => isSupported.value ? t('settings', 'Supported') : t('settings', 'Featured'))
32+
const badgeText = computed(() => isSupported.value ? t('appstore', 'Supported') : t('appstore', 'Featured'))
3333
const badgeTitle = computed(() => isSupported.value
34-
? t('settings', 'This app is supported via your current Nextcloud subscription.')
35-
: t('settings', 'Featured apps are developed by and within the community. They offer central functionality and are ready for production use.'))
34+
? t('appstore', 'This app is supported via your current Nextcloud subscription.')
35+
: t('appstore', 'Featured apps are developed by and within the community. They offer central functionality and are ready for production use.'))
3636
</script>
3737

3838
<style scoped lang="scss">

‎apps/appstore/src/components/AppList.vue‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,36 @@
1414
}">
1515
<template v-if="useListView">
1616
<div v-if="showUpdateAll" class="apps-list__toolbar">
17-
{{ n('settings', '%n app has an update available', '%n apps have an update available', counter) }}
17+
{{ n('appstore', '%n app has an update available', '%n apps have an update available', counter) }}
1818
<NcButton
1919
v-if="showUpdateAll"
2020
id="app-list-update-all"
2121
variant="primary"
2222
@click="updateAll">
23-
{{ n('settings', 'Update', 'Update all', counter) }}
23+
{{ n('appstore', 'Update', 'Update all', counter) }}
2424
</NcButton>
2525
</div>
2626

2727
<div v-if="!showUpdateAll" class="apps-list__toolbar">
28-
{{ t('settings', 'All apps are up-to-date.') }}
28+
{{ t('appstore', 'All apps are up-to-date.') }}
2929
</div>
3030

3131
<TransitionGroup name="apps-list" tag="table" class="apps-list__list-container">
3232
<tr key="app-list-view-header">
3333
<th>
34-
<span class="hidden-visually">{{ t('settings', 'Icon') }}</span>
34+
<span class="hidden-visually">{{ t('appstore', 'Icon') }}</span>
3535
</th>
3636
<th>
37-
<span class="hidden-visually">{{ t('settings', 'Name') }}</span>
37+
<span class="hidden-visually">{{ t('appstore', 'Name') }}</span>
3838
</th>
3939
<th>
40-
<span class="hidden-visually">{{ t('settings', 'Version') }}</span>
40+
<span class="hidden-visually">{{ t('appstore', 'Version') }}</span>
4141
</th>
4242
<th>
43-
<span class="hidden-visually">{{ t('settings', 'Level') }}</span>
43+
<span class="hidden-visually">{{ t('appstore', 'Level') }}</span>
4444
</th>
4545
<th>
46-
<span class="hidden-visually">{{ t('settings', 'Actions') }}</span>
46+
<span class="hidden-visually">{{ t('appstore', 'Actions') }}</span>
4747
</th>
4848
</tr>
4949
<AppItem
@@ -59,19 +59,19 @@
5959
class="apps-list__list-container">
6060
<tr key="app-list-view-header">
6161
<th id="app-table-col-icon">
62-
<span class="hidden-visually">{{ t('settings', 'Icon') }}</span>
62+
<span class="hidden-visually">{{ t('appstore', 'Icon') }}</span>
6363
</th>
6464
<th id="app-table-col-name">
65-
<span class="hidden-visually">{{ t('settings', 'Name') }}</span>
65+
<span class="hidden-visually">{{ t('appstore', 'Name') }}</span>
6666
</th>
6767
<th id="app-table-col-version">
68-
<span class="hidden-visually">{{ t('settings', 'Version') }}</span>
68+
<span class="hidden-visually">{{ t('appstore', 'Version') }}</span>
6969
</th>
7070
<th id="app-table-col-level">
71-
<span class="hidden-visually">{{ t('settings', 'Level') }}</span>
71+
<span class="hidden-visually">{{ t('appstore', 'Level') }}</span>
7272
</th>
7373
<th id="app-table-col-actions">
74-
<span class="hidden-visually">{{ t('settings', 'Actions') }}</span>
74+
<span class="hidden-visually">{{ t('appstore', 'Actions') }}</span>
7575
</th>
7676
</tr>
7777
<template v-for="bundle in bundles">
@@ -82,7 +82,7 @@
8282
{{ bundle.name }}
8383
</span>
8484
<NcButton variant="secondary" @click="toggleBundle(bundle.id)">
85-
{{ t('settings', bundleToggleText(bundle.id)) }}
85+
{{ t('appstore', bundleToggleText(bundle.id)) }}
8686
</NcButton>
8787
</div>
8888
</th>
@@ -110,23 +110,23 @@
110110
<div class="apps-list__list-container">
111111
<table v-if="search !== '' && searchApps.length > 0" class="apps-list__list-container">
112112
<caption class="apps-list__bundle-header">
113-
{{ t('settings', 'Results from other categories') }}
113+
{{ t('appstore', 'Results from other categories') }}
114114
</caption>
115115
<tr key="app-list-view-header">
116116
<th>
117-
<span class="hidden-visually">{{ t('settings', 'Icon') }}</span>
117+
<span class="hidden-visually">{{ t('appstore', 'Icon') }}</span>
118118
</th>
119119
<th>
120-
<span class="hidden-visually">{{ t('settings', 'Name') }}</span>
120+
<span class="hidden-visually">{{ t('appstore', 'Name') }}</span>
121121
</th>
122122
<th>
123-
<span class="hidden-visually">{{ t('settings', 'Version') }}</span>
123+
<span class="hidden-visually">{{ t('appstore', 'Version') }}</span>
124124
</th>
125125
<th>
126-
<span class="hidden-visually">{{ t('settings', 'Level') }}</span>
126+
<span class="hidden-visually">{{ t('appstore', 'Level') }}</span>
127127
</th>
128128
<th>
129-
<span class="hidden-visually">{{ t('settings', 'Actions') }}</span>
129+
<span class="hidden-visually">{{ t('appstore', 'Actions') }}</span>
130130
</th>
131131
</tr>
132132
<AppItem
@@ -140,7 +140,7 @@
140140

141141
<div v-if="search !== '' && !loading && searchApps.length === 0 && apps.length === 0" id="apps-list-empty" class="emptycontent emptycontent-search">
142142
<div id="app-list-empty-icon" class="icon-settings-dark" />
143-
<h2>{{ t('settings', 'No apps found for your version') }}</h2>
143+
<h2>{{ t('appstore', 'No apps found for your version') }}</h2>
144144
</div>
145145
</div>
146146
</template>
@@ -301,9 +301,9 @@ export default {
301301
bundleToggleText() {
302302
return (id) => {
303303
if (this.allBundlesEnabled(id)) {
304-
return t('settings', 'Disable all')
304+
return t('appstore', 'Disable all')
305305
}
306-
return t('settings', 'Download and enable all')
306+
return t('appstore', 'Download and enable all')
307307
}
308308
},
309309
},

‎apps/appstore/src/components/AppList/AppListItem.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
id: app.id,
4141
},
4242
}"
43-
:aria-label="t('settings', 'Show details for {appName} app', { appName: app.name })">
43+
:aria-label="t('appstore', 'Show details for {appName} app', { appName: app.name })">
4444
{{ app.name }}
4545
</router-link>
4646
</div>

‎apps/appstore/src/components/AppList/AppTable.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
id: app.id,
5454
},
5555
}"
56-
:aria-label="t('settings', 'Show details for {appName} app', { appName: app.name })">
56+
:aria-label="t('appstore', 'Show details for {appName} app', { appName: app.name })">
5757
{{ app.name }}
5858
</router-link>
5959
</component>
@@ -92,15 +92,15 @@
9292
:disabled="installing || isLoading || !defaultDeployDaemonAccessible || isManualInstall"
9393
:title="updateButtonText"
9494
@click.stop="update(app.id)">
95-
{{ t('settings', 'Update to {update}', { update: app.update }) }}
95+
{{ t('appstore', 'Update to {update}', { update: app.update }) }}
9696
</NcButton>
9797
<NcButton
9898
v-if="app.canUnInstall"
9999
class="uninstall"
100100
variant="tertiary"
101101
:disabled="installing || isLoading"
102102
@click.stop="remove(app.id)">
103-
{{ t('settings', 'Remove') }}
103+
{{ t('appstore', 'Remove') }}
104104
</NcButton>
105105
<NcButton
106106
v-if="app.active"

‎apps/appstore/src/components/AppScore.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export default defineComponent({
5353
computed: {
5454
title() {
5555
const appScore = (this.score * 5).toFixed(1)
56-
return t('settings', 'Community rating: {score}/5', { score: appScore })
56+
return t('appstore', 'Community rating: {score}/5', { score: appScore })
5757
},
5858
5959
fullStars() {

‎apps/appstore/src/components/AppStoreSidebar/AppDeployDaemonTab.vue‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77
<NcAppSidebarTab
88
v-if="app?.daemon"
99
id="daemon"
10-
:name="t('settings', 'Daemon')"
10+
:name="t('appstore', 'Daemon')"
1111
:order="3">
1212
<template #icon>
1313
<NcIconSvgWrapper :path="mdiFileChart" :size="24" />
1414
</template>
1515
<div class="daemon">
16-
<h4>{{ t('settings', 'Deploy Daemon') }}</h4>
17-
<p><b>{{ t('settings', 'Type') }}</b>: {{ app?.daemon.accepts_deploy_id }}</p>
18-
<p><b>{{ t('settings', 'Name') }}</b>: {{ app?.daemon.name }}</p>
19-
<p><b>{{ t('settings', 'Display Name') }}</b>: {{ app?.daemon.display_name }}</p>
20-
<p><b>{{ t('settings', 'GPUs support') }}</b>: {{ gpuSupport }}</p>
21-
<p><b>{{ t('settings', 'Compute device') }}</b>: {{ app?.daemon?.deploy_config?.computeDevice?.label }}</p>
16+
<h4>{{ t('appstore', 'Deploy Daemon') }}</h4>
17+
<p><b>{{ t('appstore', 'Type') }}</b>: {{ app?.daemon.accepts_deploy_id }}</p>
18+
<p><b>{{ t('appstore', 'Name') }}</b>: {{ app?.daemon.name }}</p>
19+
<p><b>{{ t('appstore', 'Display Name') }}</b>: {{ app?.daemon.display_name }}</p>
20+
<p><b>{{ t('appstore', 'GPUs support') }}</b>: {{ gpuSupport }}</p>
21+
<p><b>{{ t('appstore', 'Compute device') }}</b>: {{ app?.daemon?.deploy_config?.computeDevice?.label }}</p>
2222
</div>
2323
</NcAppSidebarTab>
2424
</template>

‎apps/appstore/src/components/AppStoreSidebar/AppDeployOptionsModal.vue‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
<NcDialog
88
:open="show"
99
size="normal"
10-
:name="t('settings', 'Advanced deploy options')"
10+
:name="t('appstore', 'Advanced deploy options')"
1111
@update:open="$emit('update:show', $event)">
1212
<div class="modal__content">
1313
<p class="deploy-option__hint">
14-
{{ configuredDeployOptions === null ? t('settings', 'Edit ExApp deploy options before installation') : t('settings', 'Configured ExApp deploy options. Can be set only during installation') }}.
14+
{{ configuredDeployOptions === null ? t('appstore', 'Edit ExApp deploy options before installation') : t('appstore', 'Configured ExApp deploy options. Can be set only during installation') }}.
1515
<a v-if="deployOptionsDocsUrl" :href="deployOptionsDocsUrl">
16-
{{ t('settings', 'Learn more') }}
16+
{{ t('appstore', 'Learn more') }}
1717
</a>
1818
</p>
1919
<h3 v-if="environmentVariables.length > 0 || (configuredDeployOptions !== null && configuredDeployOptions.environment_variables.length > 0)">
20-
{{ t('settings', 'Environment variables') }}
20+
{{ t('appstore', 'Environment variables') }}
2121
</h3>
2222
<template v-if="configuredDeployOptions === null">
2323
<div
@@ -34,7 +34,7 @@
3434
v-else-if="Object.keys(configuredDeployOptions).length > 0"
3535
class="envs">
3636
<legend class="deploy-option__hint">
37-
{{ t('settings', 'ExApp container environment variables') }}
37+
{{ t('appstore', 'ExApp container environment variables') }}
3838
</legend>
3939
<NcTextField
4040
v-for="(value, key) in configuredDeployOptions.environment_variables"
@@ -46,28 +46,28 @@
4646
</fieldset>
4747
<template v-else>
4848
<p class="deploy-option__hint">
49-
{{ t('settings', 'No environment variables defined') }}
49+
{{ t('appstore', 'No environment variables defined') }}
5050
</p>
5151
</template>
5252

53-
<h3>{{ t('settings', 'Mounts') }}</h3>
53+
<h3>{{ t('appstore', 'Mounts') }}</h3>
5454
<template v-if="configuredDeployOptions === null">
5555
<p class="deploy-option__hint">
56-
{{ t('settings', 'Define host folder mounts to bind to the ExApp container') }}
56+
{{ t('appstore', 'Define host folder mounts to bind to the ExApp container') }}
5757
</p>
58-
<NcNoteCard type="info" :text="t('settings', 'Must exist on the Deploy daemon host prior to installing the ExApp')" />
58+
<NcNoteCard type="info" :text="t('appstore', 'Must exist on the Deploy daemon host prior to installing the ExApp')" />
5959
<div
6060
v-for="mount in deployOptions.mounts"
6161
:key="mount.hostPath"
6262
class="deploy-option"
6363
style="display: flex; align-items: center; justify-content: space-between; flex-direction: row;">
64-
<NcTextField v-model="mount.hostPath" :label="t('settings', 'Host path')" />
65-
<NcTextField v-model="mount.containerPath" :label="t('settings', 'Container path')" />
64+
<NcTextField v-model="mount.hostPath" :label="t('appstore', 'Host path')" />
65+
<NcTextField v-model="mount.containerPath" :label="t('appstore', 'Container path')" />
6666
<NcCheckboxRadioSwitch v-model="mount.readonly">
67-
{{ t('settings', 'Read-only') }}
67+
{{ t('appstore', 'Read-only') }}
6868
</NcCheckboxRadioSwitch>
6969
<NcButton
70-
:aria-label="t('settings', 'Remove mount')"
70+
:aria-label="t('appstore', 'Remove mount')"
7171
style="margin-top: 6px;"
7272
@click="removeMount(mount)">
7373
<template #icon>
@@ -77,73 +77,73 @@
7777
</div>
7878
<div v-if="addingMount" class="deploy-option">
7979
<h4>
80-
{{ t('settings', 'New mount') }}
80+
{{ t('appstore', 'New mount') }}
8181
</h4>
8282
<div style="display: flex; align-items: center; justify-content: space-between; flex-direction: row;">
8383
<NcTextField
8484
ref="newMountHostPath"
8585
v-model="newMountPoint.hostPath"
86-
:label="t('settings', 'Host path')"
87-
:aria-label="t('settings', 'Enter path to host folder')" />
86+
:label="t('appstore', 'Host path')"
87+
:aria-label="t('appstore', 'Enter path to host folder')" />
8888
<NcTextField
8989
v-model="newMountPoint.containerPath"
90-
:label="t('settings', 'Container path')"
91-
:aria-label="t('settings', 'Enter path to container folder')" />
90+
:label="t('appstore', 'Container path')"
91+
:aria-label="t('appstore', 'Enter path to container folder')" />
9292
<NcCheckboxRadioSwitch
9393
v-model="newMountPoint.readonly"
94-
:aria-label="t('settings', 'Toggle read-only mode')">
95-
{{ t('settings', 'Read-only') }}
94+
:aria-label="t('appstore', 'Toggle read-only mode')">
95+
{{ t('appstore', 'Read-only') }}
9696
</NcCheckboxRadioSwitch>
9797
</div>
9898
<div style="display: flex; align-items: center; margin-top: 4px;">
9999
<NcButton
100-
:aria-label="t('settings', 'Confirm adding new mount')"
100+
:aria-label="t('appstore', 'Confirm adding new mount')"
101101
@click="addMountPoint">
102102
<template #icon>
103103
<NcIconSvgWrapper :path="mdiCheck" />
104104
</template>
105-
{{ t('settings', 'Confirm') }}
105+
{{ t('appstore', 'Confirm') }}
106106
</NcButton>
107107
<NcButton
108-
:aria-label="t('settings', 'Cancel adding mount')"
108+
:aria-label="t('appstore', 'Cancel adding mount')"
109109
style="margin-left: 4px;"
110110
@click="cancelAddMountPoint">
111111
<template #icon>
112112
<NcIconSvgWrapper :path="mdiClose" />
113113
</template>
114-
{{ t('settings', 'Cancel') }}
114+
{{ t('appstore', 'Cancel') }}
115115
</NcButton>
116116
</div>
117117
</div>
118118
<NcButton
119119
v-if="!addingMount"
120-
:aria-label="t('settings', 'Add mount')"
120+
:aria-label="t('appstore', 'Add mount')"
121121
style="margin-top: 5px;"
122122
@click="startAddingMount">
123123
<template #icon>
124124
<NcIconSvgWrapper :path="mdiPlus" />
125125
</template>
126-
{{ t('settings', 'Add mount') }}
126+
{{ t('appstore', 'Add mount') }}
127127
</NcButton>
128128
</template>
129129
<template v-else-if="configuredDeployOptions.mounts.length > 0">
130130
<p class="deploy-option__hint">
131-
{{ t('settings', 'ExApp container mounts') }}
131+
{{ t('appstore', 'ExApp container mounts') }}
132132
</p>
133133
<div
134134
v-for="mount in configuredDeployOptions.mounts"
135135
:key="mount.hostPath"
136136
class="deploy-option"
137137
style="display: flex; align-items: center; justify-content: space-between; flex-direction: row;">
138-
<NcTextField v-model="mount.hostPath" :label="t('settings', 'Host path')" readonly />
139-
<NcTextField v-model="mount.containerPath" :label="t('settings', 'Container path')" readonly />
138+
<NcTextField v-model="mount.hostPath" :label="t('appstore', 'Host path')" readonly />
139+
<NcTextField v-model="mount.containerPath" :label="t('appstore', 'Container path')" readonly />
140140
<NcCheckboxRadioSwitch v-model="mount.readonly" disabled>
141-
{{ t('settings', 'Read-only') }}
141+
{{ t('appstore', 'Read-only') }}
142142
</NcCheckboxRadioSwitch>
143143
</div>
144144
</template>
145145
<p v-else class="deploy-option__hint">
146-
{{ t('settings', 'No mounts defined') }}
146+
{{ t('appstore', 'No mounts defined') }}
147147
</p>
148148
</div>
149149

@@ -244,7 +244,7 @@ export default {
244244
245245
addingPortBinding: false,
246246
configuredDeployOptions: null,
247-
deployOptionsDocsUrl: loadState('settings', 'deployOptionsDocsUrl', null),
247+
deployOptionsDocsUrl: loadState('appstore', 'deployOptionsDocsUrl', null),
248248
}
249249
},
250250

‎apps/appstore/src/components/AppStoreSidebar/AppDescriptionTab.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<template>
77
<NcAppSidebarTab
88
id="desc"
9-
:name="t('settings', 'Description')"
9+
:name="t('appstore', 'Description')"
1010
:order="0">
1111
<template #icon>
1212
<NcIconSvgWrapper :path="mdiTextShort" />

0 commit comments

Comments
 (0)