From ed33b1569e8214192213400bc44081587dbc4050 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Fri, 25 Oct 2019 18:48:30 +0200
Subject: [PATCH] Add translations to emojiPacks module and alphabetize it
---
src/lang/en.js | 8 ++++-
src/store/modules/emojiPacks.js | 55 ++++++++++++++++-----------------
2 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/src/lang/en.js b/src/lang/en.js
index 8575144a..6e6a892e 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -365,7 +365,13 @@ export default {
deletePack: 'Delete pack',
downloadSharedPack: 'Download shared pack to current instance',
downloadAsOptional: 'Download as (optional)',
- downloadPackArchive: 'Download pack archive'
+ downloadPackArchive: 'Download pack archive',
+ successfullyDownloaded: 'Successfully downloaded',
+ successfullyImported: 'Successfully imported',
+ nowNewPacksToImport: 'No new packs to import',
+ successfullyUpdated: 'Successfully updated',
+ metadatLowerCase: 'metadata',
+ files: 'files'
},
invites: {
inviteTokens: 'Invite tokens',
diff --git a/src/store/modules/emojiPacks.js b/src/store/modules/emojiPacks.js
index 6a14e406..c118b71f 100644
--- a/src/store/modules/emojiPacks.js
+++ b/src/store/modules/emojiPacks.js
@@ -8,7 +8,7 @@ import {
savePackMetadata,
importFromFS,
updatePackFile } from '@/api/emojiPacks'
-
+import i18n from '@/lang'
import { Message } from 'element-ui'
import Vue from 'vue'
@@ -44,34 +44,30 @@ const packs = {
}
},
actions: {
- async SetLocalEmojiPacks({ commit, getters, state }) {
- const { data } = await listPacks(getters.authHost)
- commit('SET_LOCAL_PACKS', data)
+ async CreatePack({ getters }, { name }) {
+ await createPack(getters.authHost, getters.token, name)
},
- async SetRemoteEmojiPacks({ commit, getters, state }, { remoteInstance }) {
- const { data } = await listRemotePacks(getters.authHost, getters.token, remoteInstance)
-
- commit('SET_REMOTE_PACKS', data)
+ async DeletePack({ getters }, { name }) {
+ await deletePack(getters.authHost, getters.token, name)
},
- async DownloadFrom({ commit, getters, state }, { instanceAddress, packName, as }) {
+ async DownloadFrom({ getters }, { instanceAddress, packName, as }) {
const result = await downloadFrom(getters.authHost, instanceAddress, packName, as, getters.token)
if (result.data === 'ok') {
Message({
- message: `Successfully downloaded ${packName}`,
+ message: `${i18n.t('settings.successfullyDownloaded')} ${packName}`,
type: 'success',
duration: 5 * 1000
})
}
},
- async ReloadEmoji({ commit, getters, state }) {
- await reloadEmoji(getters.authHost, getters.token)
- },
- async ImportFromFS({ commit, getters, state }) {
+ async ImportFromFS({ getters }) {
const result = await importFromFS(getters.authHost, getters.token)
if (result.status === 200) {
- const message = result.data.length > 0 ? `Successfully imported ${result.data}` : 'No new packs to import'
+ const message = result.data.length > 0
+ ? `${i18n.t('settings.successfullyImported')} ${result.data}`
+ : i18n.t('settings.nowNewPacksToImport')
Message({
message,
@@ -80,17 +76,9 @@ const packs = {
})
}
},
- async DeletePack({ commit, getters, state }, { name }) {
- await deletePack(getters.authHost, getters.token, name)
- },
- async CreatePack({ commit, getters, state }, { name }) {
- await createPack(getters.authHost, getters.token, name)
- },
-
- async UpdateLocalPackVal({ commit, getters, state }, args) {
- commit('UPDATE_LOCAL_PACK_VAL', args)
+ async ReloadEmoji({ getters }) {
+ await reloadEmoji(getters.authHost, getters.token)
},
-
async SavePackMetadata({ commit, getters, state }, { packName }) {
const result =
await savePackMetadata(
@@ -102,7 +90,7 @@ const packs = {
if (result.status === 200) {
Message({
- message: `Successfully updated ${packName} metadata`,
+ message: `${i18n.t('settings.successfullyUpdated')} ${packName} ${i18n.t('settings.metadatLowerCase')}`,
type: 'success',
duration: 5 * 1000
})
@@ -110,21 +98,32 @@ const packs = {
commit('UPDATE_LOCAL_PACK_PACK', { name: packName, pack: result.data })
}
},
+ async SetLocalEmojiPacks({ commit, getters }) {
+ const { data } = await listPacks(getters.authHost)
+ commit('SET_LOCAL_PACKS', data)
+ },
+ async SetRemoteEmojiPacks({ commit, getters }, { remoteInstance }) {
+ const { data } = await listRemotePacks(getters.authHost, getters.token, remoteInstance)
- async UpdateAndSavePackFile({ commit, getters, state }, args) {
+ commit('SET_REMOTE_PACKS', data)
+ },
+ async UpdateAndSavePackFile({ commit, getters }, args) {
const result = await updatePackFile(getters.authHost, getters.token, args)
if (result.status === 200) {
const { packName } = args
Message({
- message: `Successfully updated ${packName} files`,
+ message: `${i18n.t('settings.successfullyUpdated')} ${packName} ${i18n.t('settings.metadatLowerCase')}`,
type: 'success',
duration: 5 * 1000
})
commit('UPDATE_LOCAL_PACK_FILES', { name: packName, files: result.data })
}
+ },
+ async UpdateLocalPackVal({ commit }, args) {
+ commit('UPDATE_LOCAL_PACK_VAL', args)
}
}
}
--
GitLab