diff --git a/src/lang/en.js b/src/lang/en.js index 3f9643ca..d0728e07 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -416,7 +416,7 @@ export default { shortcode: 'Shortcode', fallbackSrc: 'Fallback source', fallbackSrcSha: 'Fallback source SHA', - savePackMetadata: 'Save pack metadata', + saveMetadata: 'Save metadata', deletePack: 'Delete pack', downloadPack: 'Download pack', downloadPackArchive: 'Download pack archive', @@ -428,6 +428,7 @@ export default { willBeUsable: 'It will then be usable and shareable from the current instance', downloadAsOptional: 'Download as (optional)', downloadSharedPack: 'Download shared pack to current instance', + downloadSharedPackMobile: 'Download pack to instance', optional: 'optional', uploadFile: 'Upload a file', url: 'URL', diff --git a/src/store/modules/emojiPacks.js b/src/store/modules/emojiPacks.js index c118b71f..282a069e 100644 --- a/src/store/modules/emojiPacks.js +++ b/src/store/modules/emojiPacks.js @@ -16,24 +16,25 @@ import Vue from 'vue' const packs = { state: { localPacks: {}, + remoteInstance: '', remotePacks: {} }, mutations: { SET_LOCAL_PACKS: (state, packs) => { state.localPacks = packs }, + SET_REMOTE_INSTANCE: (state, name) => { + state.remoteInstance = name + }, SET_REMOTE_PACKS: (state, packs) => { state.remotePacks = packs }, - UPDATE_LOCAL_PACK_VAL: (state, { name, key, value }) => { Vue.set(state.localPacks[name]['pack'], key, value) }, - UPDATE_LOCAL_PACK_PACK: (state, { name, pack }) => { state.localPacks[name]['pack'] = pack }, - UPDATE_LOCAL_PACK_FILES: (state, { name, files }) => { // Use vue.set in case "files" was null Vue.set( @@ -105,6 +106,7 @@ const packs = { async SetRemoteEmojiPacks({ commit, getters }, { remoteInstance }) { const { data } = await listRemotePacks(getters.authHost, getters.token, remoteInstance) + commit('SET_REMOTE_INSTANCE', remoteInstance) commit('SET_REMOTE_PACKS', data) }, async UpdateAndSavePackFile({ commit, getters }, args) { diff --git a/src/views/emojiPacks/components/EmojiPack.vue b/src/views/emojiPacks/components/EmojiPack.vue index 3a8bf97a..e20dc216 100644 --- a/src/views/emojiPacks/components/EmojiPack.vue +++ b/src/views/emojiPacks/components/EmojiPack.vue @@ -1,6 +1,6 @@