Fix typo, add warning on replacing local pack

This commit is contained in:
Ekaterina Vaartis 2024-01-22 23:43:20 +03:00
parent 4d7a915154
commit d5a5b8e254
5 changed files with 21 additions and 6 deletions

View File

@ -60,6 +60,10 @@ const EmojiTab = {
}
return result
},
downloadWillReplaceLocal () {
return (this.remotePackDownloadAs.trim() === '' && this.pack.remote && this.pack.remote.baseName in this.knownLocalPacks) ||
(this.remotePackDownloadAs in this.knownLocalPacks)
}
},

View File

@ -54,4 +54,8 @@
.emoji-tab-popover-file {
padding-top: 3px;
}
.warning {
color: var(--cOrange, $fallback--cOrange);
}
}

View File

@ -200,10 +200,16 @@
<div>
<div>
<div class="emoji-tab-popover-input">
<label for="remote-download-as-input">{{ $t('admin_dash.emoji.download_as_name') }}</label>
<input id="remote-download-as-input" class="emoji-data-input"
v-model="remotePackDownloadAs"
:placeholder="$t('admin_dash.emoji.download_as_name_full')">
<label>
{{ $t('admin_dash.emoji.download_as_name') }}
<input class="emoji-data-input"
v-model="remotePackDownloadAs"
:placeholder="$t('admin_dash.emoji.download_as_name_full')">
</label>
<div v-if="downloadWillReplaceLocal" class="warning">
<em>{{ $t('admin_dash.emoji.replace_warning') }}</em>
</div>
</div>
<button

View File

@ -168,7 +168,7 @@ export default {
})
}
},
emits: ['updatePackFiles', 'displaError'],
emits: ['updatePackFiles', 'displayError'],
props: {
placement: String,
disabled: {

View File

@ -974,7 +974,8 @@
"editing": "Editing {0}",
"delete_title": "Delete?",
"metadata_changed": "Metadata different from saved",
"emoji_changed": "Unsaved emoji file changes, check highlighted emoji"
"emoji_changed": "Unsaved emoji file changes, check highlighted emoji",
"replace_warning": "This will REPLACE the local pack of the same name"
},
"temp_overrides": {
":pleroma": {