Skip to content

Commit 87741e1

Browse files
lastzerolastzero
committed
UX: Change order of feature flag toggles in Settings > General
Signed-off-by: Michael Mayer <michael@photoprism.app>
1 parent d8937c5 commit 87741e1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+670
-699
lines changed

‎frontend/.prettierrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"printWidth": 120,
2+
"printWidth": 160,
33
"semi": true,
44
"singleQuote": false,
55
"trailingComma": "es5",

‎frontend/eslint.config.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ export default defineConfig([
128128
"prettier/prettier": [
129129
"warn",
130130
{
131-
printWidth: 120,
131+
printWidth: 160,
132132
semi: true,
133133
singleQuote: false,
134134
bracketSpacing: true,

‎frontend/src/component/upload/dialog.vue‎

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,7 @@
1414
<v-form ref="form" class="p-photo-upload" validate-on="invalid-input" tabindex="-1" @submit.prevent="onSubmit">
1515
<input ref="upload" type="file" multiple :accept="accept" class="d-none input-upload" @change.stop="onUpload()" />
1616
<v-card :tile="$vuetify.display.mdAndDown">
17-
<v-toolbar
18-
v-if="$vuetify.display.mdAndDown"
19-
flat
20-
color="navigation"
21-
class="mb-4"
22-
:density="$vuetify.display.smAndDown ? 'compact' : 'default'"
23-
>
17+
<v-toolbar v-if="$vuetify.display.mdAndDown" flat color="navigation" class="mb-4" :density="$vuetify.display.smAndDown ? 'compact' : 'default'">
2418
<v-btn icon @click.stop="onClose">
2519
<v-icon>mdi-close</v-icon>
2620
</v-btn>
@@ -42,8 +36,7 @@
4236
<span v-else-if="indexing">{{ $gettext(`Upload complete. Indexing…`) }}</span>
4337
<span v-else-if="completedTotal === 100">{{ $gettext(`Done.`) }}</span>
4438
<span v-else-if="filesQuotaReached"
45-
>{{ $gettext(`Insufficient storage.`) }}
46-
{{ $gettext(`Increase storage size or delete files to continue.`) }}</span
39+
>{{ $gettext(`Insufficient storage.`) }} {{ $gettext(`Increase storage size or delete files to continue.`) }}</span
4740
>
4841
<span v-else>{{ $gettext(`Select the files to upload…`) }}</span>
4942
</div>
@@ -97,19 +90,15 @@
9790
</div>
9891
<div class="form-text">
9992
<p v-if="isDemo">
100-
{{ $gettext(`You can upload up to %{n} files for test purposes.`, { n: fileLimit }) }}
101-
{{ $gettext(`Please do not upload any private, unlawful or offensive pictures. `) }}
93+
{{ $gettext(`You can upload up to %{n} files for test purposes.`, { n: fileLimit }) }}&nbsp;
94+
{{ $gettext(`Please do not upload any private, unlawful or offensive pictures.`) }}
10295
</p>
10396
<p v-else-if="rejectNSFW">
104-
{{ $gettext(`Please don't upload photos containing offensive content.`) }}
97+
{{ $gettext(`Please don't upload photos containing offensive content.`) }}&nbsp;
10598
{{ $gettext(`Uploads that may contain such images will be rejected automatically.`) }}
10699
</p>
107100
<p v-if="featReview">
108-
{{
109-
$gettext(
110-
`Non-photographic and low-quality images require a review before they appear in search results.`
111-
)
112-
}}
101+
{{ $gettext(`Non-photographic and low-quality images require a review before they appear in search results.`) }}
113102
</p>
114103
</div>
115104
</div>
@@ -119,13 +108,7 @@
119108
<v-btn :disabled="busy" variant="flat" color="button" class="action-close" @click.stop="onClose">
120109
{{ $gettext(`Close`) }}
121110
</v-btn>
122-
<v-btn
123-
:disabled="busy || filesQuotaReached"
124-
variant="flat"
125-
color="highlight"
126-
class="action-select action-upload"
127-
@click.stop="onUploadDialog()"
128-
>
111+
<v-btn :disabled="busy || filesQuotaReached" variant="flat" color="highlight" class="action-select action-upload" @click.stop="onUploadDialog()">
129112
{{ $gettext(`Browse`) }}
130113
</v-btn>
131114
</v-card-actions>

‎frontend/src/locales/af.po‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -381,31 +381,31 @@ msgstr "Alle oorspronklikes"
381381
msgid "All Years"
382382
msgstr "Alle Jare"
383383

384-
#: src/page/settings/general.vue:284
384+
#: src/page/settings/general.vue:255
385385
msgid "Allow configuration and use of connected apps and services for remote uploads and sync."
386386
msgstr "Laat die konfigurasie en gebruik van gekoppelde programme en dienste toe vir oplaaie en sinkronisering op afstand."
387387

388-
#: src/page/settings/general.vue:224
388+
#: src/page/settings/general.vue:209
389389
msgid "Allow editing of metadata such as title, description, date, and location."
390390
msgstr "Laat redigering van metadata soos titel, beskrywing, datum en ligging toe."
391391

392-
#: src/page/settings/general.vue:239
392+
#: src/page/settings/general.vue:224
393393
msgid "Allow editing the metadata, labels, and albums of multiple pictures at once."
394394
msgstr "Laat die redigering van die metadata, etikette en albums van verskeie prente gelyktydig toe."
395395

396396
#: src/page/settings/general.vue:194
397397
msgid "Allow files to be copied or moved from the Import to the Originals folder."
398398
msgstr "Aktiveer die Invoer-instrument om lêers van die Invoer-vouer na Oorspronklikes te kopieer of te skuif."
399399

400-
#: src/page/settings/general.vue:269
400+
#: src/page/settings/general.vue:286
401401
msgid "Allow files to be permanently deleted to free up storage space."
402402
msgstr "Laat toe dat lêers permanent verwyder word om stoorplek vry te maak."
403403

404-
#: src/page/settings/general.vue:254
404+
#: src/page/settings/general.vue:271
405405
msgid "Allow users to archive photos and videos so they are hidden without being deleted."
406406
msgstr "Laat gebruikers toe om foto's en video's te argiveer sodat hulle versteek word sonder om uitgevee te word."
407407

408-
#: src/page/settings/general.vue:209
408+
#: src/page/settings/general.vue:239
409409
msgid "Allow users to create and share links, and enable sharing with connected services."
410410
msgstr "Laat gebruikers toe om skakels te skep en te deel, en aktiveer deling met gekoppelde dienste."
411411

@@ -582,7 +582,7 @@ msgstr "Basispad"
582582
msgid "Batch"
583583
msgstr "Groep"
584584

585-
#: src/page/settings/general.vue:238
585+
#: src/page/settings/general.vue:223
586586
msgid "Batch Edit"
587587
msgstr "Groepwysiging"
588588

@@ -1061,7 +1061,7 @@ msgstr "Verstek gids"
10611061
#: src/component/photo/clipboard.vue:140 src/component/photo/edit/files.vue:62
10621062
#: src/component/photo/edit/files.vue:70 src/component/photo/edit/files.vue:94
10631063
#: src/component/service/remove.vue:22 src/component/share/dialog.vue:112
1064-
#: src/locales.js:317 src/page/settings/general.vue:268
1064+
#: src/locales.js:317 src/page/settings/general.vue:285
10651065
msgid "Delete"
10661066
msgstr "Vee uit"
10671067

@@ -1303,7 +1303,7 @@ msgstr "E-pos"
13031303

13041304
#: src/component/album/clipboard.vue:43 src/component/album/toolbar.vue:174
13051305
#: src/component/lightbox.vue:1378 src/component/lightbox.vue:1379
1306-
#: src/component/photo/clipboard.vue:68 src/page/settings/general.vue:223
1306+
#: src/component/photo/clipboard.vue:68 src/page/settings/general.vue:208
13071307
msgid "Edit"
13081308
msgstr "Wysig"
13091309

@@ -2657,7 +2657,7 @@ msgid "Please copy the following randomly generated app password and keep it in
26572657
msgstr "Kopieer asseblief die volgende lukraak gegenereerde programwagwoord en hou dit op 'n veilige plek, aangesien jy dit nie weer sal kan sien nie:"
26582658

26592659
#: src/component/upload/dialog.vue:101
2660-
msgid "Please do not upload any private, unlawful or offensive pictures. "
2660+
msgid "Please do not upload any private, unlawful or offensive pictures."
26612661
msgstr "Moet asseblief geen privaat, onwettige of aanstootlike foto's oplaai nie."
26622662

26632663
#: src/component/upload/dialog.vue:104
@@ -3132,7 +3132,7 @@ msgid "Service URL"
31323132
msgstr "Diens-URL"
31333133

31343134
#: src/locales.js:359 src/page/settings.vue:99
3135-
#: src/page/settings/general.vue:282
3135+
#: src/page/settings/general.vue:253
31363136
msgid "Services"
31373137
msgstr "Dienste"
31383138

@@ -3183,7 +3183,7 @@ msgid "Severity"
31833183
msgstr "Ernstigheid"
31843184

31853185
#: src/component/album/clipboard.vue:32 src/component/album/toolbar.vue:183
3186-
#: src/component/photo/clipboard.vue:32 src/page/settings/general.vue:208
3186+
#: src/component/photo/clipboard.vue:32 src/page/settings/general.vue:238
31873187
msgid "Share"
31883188
msgstr "Deel"
31893189

@@ -3996,7 +3996,7 @@ msgstr "Inhoud"
39963996
#: src/component/navigation.vue:128 src/component/navigation.vue:152
39973997
#: src/component/navigation.vue:158 src/component/navigation.vue:173
39983998
#: src/component/navigation.vue:188 src/component/navigation.vue:240
3999-
#: src/component/navigation.vue:246 src/page/settings/general.vue:253
3999+
#: src/component/navigation.vue:246 src/page/settings/general.vue:270
40004000
msgctxt "Noun"
40014001
msgid "Archive"
40024002
msgstr "Argief"

‎frontend/src/locales/ar.po‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -384,31 +384,31 @@ msgstr "جميع النسخ الأصلية"
384384
msgid "All Years"
385385
msgstr "جميع السنوات"
386386

387-
#: src/page/settings/general.vue:284
387+
#: src/page/settings/general.vue:255
388388
msgid "Allow configuration and use of connected apps and services for remote uploads and sync."
389389
msgstr "السماح بتكوين واستخدام التطبيقات والخدمات المتصلة للتحميل والمزامنة عن بُعد."
390390

391-
#: src/page/settings/general.vue:224
391+
#: src/page/settings/general.vue:209
392392
msgid "Allow editing of metadata such as title, description, date, and location."
393393
msgstr "السماح بتحرير البيانات الوصفية مثل العنوان والوصف والتاريخ والموقع."
394394

395-
#: src/page/settings/general.vue:239
395+
#: src/page/settings/general.vue:224
396396
msgid "Allow editing the metadata, labels, and albums of multiple pictures at once."
397397
msgstr "السماح بتحرير البيانات الوصفية والتسميات والألبومات لصور متعددة في وقت واحد."
398398

399399
#: src/page/settings/general.vue:194
400400
msgid "Allow files to be copied or moved from the Import to the Originals folder."
401401
msgstr "قم بتمكين أداة الاستيراد لنسخ الملفات أو نقلها من مجلد الاستيراد إلى النسخ الأصلية."
402402

403-
#: src/page/settings/general.vue:269
403+
#: src/page/settings/general.vue:286
404404
msgid "Allow files to be permanently deleted to free up storage space."
405405
msgstr "السماح بحذف الملفات بشكل دائم لتحرير مساحة تخزين."
406406

407-
#: src/page/settings/general.vue:254
407+
#: src/page/settings/general.vue:271
408408
msgid "Allow users to archive photos and videos so they are hidden without being deleted."
409409
msgstr "السماح للمستخدمين بأرشفة الصور ومقاطع الفيديو بحيث يتم إخفاؤها دون حذفها."
410410

411-
#: src/page/settings/general.vue:209
411+
#: src/page/settings/general.vue:239
412412
msgid "Allow users to create and share links, and enable sharing with connected services."
413413
msgstr "السماح للمستخدمين بإنشاء الروابط ومشاركتها، وتمكين المشاركة مع الخدمات المتصلة."
414414

@@ -585,7 +585,7 @@ msgstr "مسار القاعدة"
585585
msgid "Batch"
586586
msgstr "الدفعة"
587587

588-
#: src/page/settings/general.vue:238
588+
#: src/page/settings/general.vue:223
589589
msgid "Batch Edit"
590590
msgstr "تحرير الدُفعات"
591591

@@ -1064,7 +1064,7 @@ msgstr "المجلد المبدئي"
10641064
#: src/component/photo/clipboard.vue:140 src/component/photo/edit/files.vue:62
10651065
#: src/component/photo/edit/files.vue:70 src/component/photo/edit/files.vue:94
10661066
#: src/component/service/remove.vue:22 src/component/share/dialog.vue:112
1067-
#: src/locales.js:317 src/page/settings/general.vue:268
1067+
#: src/locales.js:317 src/page/settings/general.vue:285
10681068
msgid "Delete"
10691069
msgstr "حذف"
10701070

@@ -1306,7 +1306,7 @@ msgstr "البريد الإلكتروني"
13061306

13071307
#: src/component/album/clipboard.vue:43 src/component/album/toolbar.vue:174
13081308
#: src/component/lightbox.vue:1378 src/component/lightbox.vue:1379
1309-
#: src/component/photo/clipboard.vue:68 src/page/settings/general.vue:223
1309+
#: src/component/photo/clipboard.vue:68 src/page/settings/general.vue:208
13101310
msgid "Edit"
13111311
msgstr "تعديل"
13121312

@@ -2660,7 +2660,7 @@ msgid "Please copy the following randomly generated app password and keep it in
26602660
msgstr "يرجى نسخ كلمة مرور التطبيق التالية التي تم إنشاؤها عشوائيًا والاحتفاظ بها في مكان آمن، حيث لن تتمكن من رؤيتها مرة أخرى:"
26612661

26622662
#: src/component/upload/dialog.vue:101
2663-
msgid "Please do not upload any private, unlawful or offensive pictures. "
2663+
msgid "Please do not upload any private, unlawful or offensive pictures."
26642664
msgstr "يرجى عدم تحميل أي صور خاصة أو غير قانونية أو مسيئة."
26652665

26662666
#: src/component/upload/dialog.vue:104
@@ -3135,7 +3135,7 @@ msgid "Service URL"
31353135
msgstr "رابط الخدمة"
31363136

31373137
#: src/locales.js:359 src/page/settings.vue:99
3138-
#: src/page/settings/general.vue:282
3138+
#: src/page/settings/general.vue:253
31393139
msgid "Services"
31403140
msgstr "الخدمات"
31413141

@@ -3186,7 +3186,7 @@ msgid "Severity"
31863186
msgstr "الخطورة"
31873187

31883188
#: src/component/album/clipboard.vue:32 src/component/album/toolbar.vue:183
3189-
#: src/component/photo/clipboard.vue:32 src/page/settings/general.vue:208
3189+
#: src/component/photo/clipboard.vue:32 src/page/settings/general.vue:238
31903190
msgid "Share"
31913191
msgstr "المشاركة"
31923192

@@ -3999,7 +3999,7 @@ msgstr "محتوى"
39993999
#: src/component/navigation.vue:128 src/component/navigation.vue:152
40004000
#: src/component/navigation.vue:158 src/component/navigation.vue:173
40014001
#: src/component/navigation.vue:188 src/component/navigation.vue:240
4002-
#: src/component/navigation.vue:246 src/page/settings/general.vue:253
4002+
#: src/component/navigation.vue:246 src/page/settings/general.vue:270
40034003
msgctxt "Noun"
40044004
msgid "Archive"
40054005
msgstr "الأرشيف"

‎frontend/src/locales/be.po‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -381,31 +381,31 @@ msgstr "Усе арыгіналы"
381381
msgid "All Years"
382382
msgstr "Усе гады"
383383

384-
#: src/page/settings/general.vue:284
384+
#: src/page/settings/general.vue:255
385385
msgid "Allow configuration and use of connected apps and services for remote uploads and sync."
386386
msgstr "Дазволіць канфігурацыю і выкарыстанне падлучаных праграм і сэрвісаў для дыстанцыйнай загрузкі і сінхранізацыі."
387387

388-
#: src/page/settings/general.vue:224
388+
#: src/page/settings/general.vue:209
389389
msgid "Allow editing of metadata such as title, description, date, and location."
390390
msgstr "Дазволіць рэдагаванне метададзеных, такіх як назва, апісанне, дата і месцазнаходжанне."
391391

392-
#: src/page/settings/general.vue:239
392+
#: src/page/settings/general.vue:224
393393
msgid "Allow editing the metadata, labels, and albums of multiple pictures at once."
394394
msgstr "Дазволіць рэдагаваць метададзеныя, цэтлікі і альбомы некалькіх малюнкаў адначасова."
395395

396396
#: src/page/settings/general.vue:194
397397
msgid "Allow files to be copied or moved from the Import to the Originals folder."
398398
msgstr "Уключыце інструмент імпарту, каб капіраваць або перамяшчаць файлы з папкі імпарту ў тэчку «Арыгіналы»."
399399

400-
#: src/page/settings/general.vue:269
400+
#: src/page/settings/general.vue:286
401401
msgid "Allow files to be permanently deleted to free up storage space."
402402
msgstr "Дазволіць выдаленне файлаў назаўсёды, каб вызваліць месца для захоўвання."
403403

404-
#: src/page/settings/general.vue:254
404+
#: src/page/settings/general.vue:271
405405
msgid "Allow users to archive photos and videos so they are hidden without being deleted."
406406
msgstr "Дазволіць карыстальнікам архіваваць фота і відэа, каб яны былі схаваныя, але не выдаленыя."
407407

408-
#: src/page/settings/general.vue:209
408+
#: src/page/settings/general.vue:239
409409
msgid "Allow users to create and share links, and enable sharing with connected services."
410410
msgstr "Дазволіць карыстальнікам ствараць і дзяліцца спасылкамі, а таксама ўключыць абмен з падлучанымі сэрвісамі."
411411

@@ -582,7 +582,7 @@ msgstr "Базавы шлях"
582582
msgid "Batch"
583583
msgstr "Пакет"
584584

585-
#: src/page/settings/general.vue:238
585+
#: src/page/settings/general.vue:223
586586
msgid "Batch Edit"
587587
msgstr "Пакетнае рэдагаванне"
588588

@@ -1061,7 +1061,7 @@ msgstr "Папка па змаўчанні"
10611061
#: src/component/photo/clipboard.vue:140 src/component/photo/edit/files.vue:62
10621062
#: src/component/photo/edit/files.vue:70 src/component/photo/edit/files.vue:94
10631063
#: src/component/service/remove.vue:22 src/component/share/dialog.vue:112
1064-
#: src/locales.js:317 src/page/settings/general.vue:268
1064+
#: src/locales.js:317 src/page/settings/general.vue:285
10651065
msgid "Delete"
10661066
msgstr "Выдаліць"
10671067

@@ -1303,7 +1303,7 @@ msgstr "Электронная пошта"
13031303

13041304
#: src/component/album/clipboard.vue:43 src/component/album/toolbar.vue:174
13051305
#: src/component/lightbox.vue:1378 src/component/lightbox.vue:1379
1306-
#: src/component/photo/clipboard.vue:68 src/page/settings/general.vue:223
1306+
#: src/component/photo/clipboard.vue:68 src/page/settings/general.vue:208
13071307
msgid "Edit"
13081308
msgstr "Рэдагаваць"
13091309

@@ -2657,7 +2657,7 @@ msgid "Please copy the following randomly generated app password and keep it in
26572657
msgstr "Калі ласка, скапіруйце наступны выпадкова згенераваны пароль праграмы і захавайце яго ў надзейным месцы, бо вы не зможаце ўбачыць яго зноў:"
26582658

26592659
#: src/component/upload/dialog.vue:101
2660-
msgid "Please do not upload any private, unlawful or offensive pictures. "
2660+
msgid "Please do not upload any private, unlawful or offensive pictures."
26612661
msgstr "Калі ласка, не запампоўвайце прыватныя, незаконныя або абразлівыя фатаграфіі."
26622662

26632663
#: src/component/upload/dialog.vue:104
@@ -3132,7 +3132,7 @@ msgid "Service URL"
31323132
msgstr "URL службы"
31333133

31343134
#: src/locales.js:359 src/page/settings.vue:99
3135-
#: src/page/settings/general.vue:282
3135+
#: src/page/settings/general.vue:253
31363136
msgid "Services"
31373137
msgstr "Сэрвісы"
31383138

@@ -3183,7 +3183,7 @@ msgid "Severity"
31833183
msgstr "Сур'ёзнасць"
31843184

31853185
#: src/component/album/clipboard.vue:32 src/component/album/toolbar.vue:183
3186-
#: src/component/photo/clipboard.vue:32 src/page/settings/general.vue:208
3186+
#: src/component/photo/clipboard.vue:32 src/page/settings/general.vue:238
31873187
msgid "Share"
31883188
msgstr "падзяліцца"
31893189

@@ -3996,7 +3996,7 @@ msgstr "Змест"
39963996
#: src/component/navigation.vue:128 src/component/navigation.vue:152
39973997
#: src/component/navigation.vue:158 src/component/navigation.vue:173
39983998
#: src/component/navigation.vue:188 src/component/navigation.vue:240
3999-
#: src/component/navigation.vue:246 src/page/settings/general.vue:253
3999+
#: src/component/navigation.vue:246 src/page/settings/general.vue:270
40004000
msgctxt "Noun"
40014001
msgid "Archive"
40024002
msgstr "Архіў"

0 commit comments

Comments
 (0)