diff options
| -rw-r--r-- | src/components/emoji-input/emoji-input.js | 8 | ||||
| -rw-r--r-- | src/components/post_status_form/post_status_form.vue | 19 | ||||
| -rw-r--r-- | src/i18n/oc.json | 44 |
3 files changed, 50 insertions, 21 deletions
diff --git a/src/components/emoji-input/emoji-input.js b/src/components/emoji-input/emoji-input.js index cd0247df..b09dc628 100644 --- a/src/components/emoji-input/emoji-input.js +++ b/src/components/emoji-input/emoji-input.js @@ -105,6 +105,7 @@ const EmojiInput = { input.elm.addEventListener('keyup', this.onKeyUp) input.elm.addEventListener('keydown', this.onKeyDown) input.elm.addEventListener('transitionend', this.onTransition) + input.elm.addEventListener('compositionupdate', this.onCompositionUpdate) }, unmounted () { const { input } = this @@ -115,6 +116,7 @@ const EmojiInput = { input.elm.removeEventListener('keyup', this.onKeyUp) input.elm.removeEventListener('keydown', this.onKeyDown) input.elm.removeEventListener('transitionend', this.onTransition) + input.elm.removeEventListener('compositionupdate', this.onCompositionUpdate) } }, methods: { @@ -225,6 +227,12 @@ const EmojiInput = { } }, onInput (e) { + this.setCaret(e) + this.$emit('input', e.target.value) + }, + onCompositionUpdate (e) { + this.setCaret(e) + this.resize() this.$emit('input', e.target.value) }, setCaret ({ target: { selectionStart } }) { diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index 67cdc721..52d1b43c 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -74,6 +74,13 @@ </p> </EmojiInput> <div class="visibility-tray"> + <scope-selector + :showAll="showAllScopes" + :userDefault="userDefaultScope" + :originalScope="copyMessageScope" + :initialScope="newStatus.visibility" + :onScopeChange="changeVis"/> + <div class="text-format" v-if="postFormats.length > 1"> <label for="post-content-type" class="select"> <select id="post-content-type" v-model="newStatus.contentType" class="form-control"> @@ -84,18 +91,11 @@ <i class="icon-down-open"></i> </label> </div> - <div class="text-format" v-if="postFormats.length === 1"> + <div class="text-format" v-if="postFormats.length === 1 && postFormats[0] !== 'text/plain'"> <span class="only-format"> {{$t(`post_status.content_type["${postFormats[0]}"]`)}} </span> </div> - - <scope-selector - :showAll="showAllScopes" - :userDefault="userDefaultScope" - :originalScope="copyMessageScope" - :initialScope="newStatus.visibility" - :onScopeChange="changeVis"/> </div> </div> <poll-form @@ -170,7 +170,6 @@ .visibility-tray { display: flex; justify-content: space-between; - flex-direction: row-reverse; padding-top: 5px; } } @@ -217,7 +216,7 @@ .icon-chart-bar { cursor: pointer; } - + .error { text-align: center; diff --git a/src/i18n/oc.json b/src/i18n/oc.json index ec7f5740..6100a4d2 100644 --- a/src/i18n/oc.json +++ b/src/i18n/oc.json @@ -78,6 +78,20 @@ "repeated_you": "a repetit vòstre estatut", "no_more_notifications": "Pas mai de notificacions" }, + "polls": { +"add_poll": "Ajustar un sondatge", + "add_option": "Ajustar d’opcions", + "option": "Opcion", + "votes": "vòtes", + "vote": "Votar", + "type": "Tipe de sondatge", + "single_choice": "Causida unica", + "multiple_choices": "Causida multipla", + "expiry": "Durada del sondatge", + "expires_in": "Lo sondatge s’acabarà {0}", + "expired": "Sondatge acabat {0}", + "not_enough_options": "I a pas pro d’opcions" + }, "post_status": { "new_status": "Publicar d’estatuts novèls", "account_not_locked_warning": "Vòstre compte es pas {0}. Qual que siá pòt vos seguir per veire vòstras publicacions destinadas pas qu’a vòstres seguidors.", @@ -197,6 +211,7 @@ "loop_video": "Bocla vidèo", "loop_video_silent_only": "Legir en bocla solament las vidèos sens son (coma los « Gifs » de Mastodon)", "mutes_tab": "Agamats", + "interactions_tab": "Interaccions", "play_videos_in_modal": "Legir las vidèos dirèctament dins la visualizaira mèdia", "use_contain_fit": "Talhar pas las pèças juntas per las vinhetas", "name": "Nom", @@ -264,8 +279,15 @@ "false": "non", "true": "òc" }, - "notifications": "Notificacions", - "enable_web_push_notifications": "Activar las notificacions web push", + "notifications": "Notificacions", + "notification_setting": "Receber las notificacions de :", + "notification_setting_follows": "Utilizaires que seguissètz", + "notification_setting_non_follows": "Utilizaires que seguissètz pas", + "notification_setting_followers": "Utilizaires que vos seguisson", + "notification_setting_non_followers": "Utilizaires que vos seguisson pas", + "notification_mutes": "Per receber pas mai d’un utilizaire en particular, botatz-lo en silenci.", + "notification_blocks": "Blocar un utilizaire arrèsta totas las notificacions tan coma quitar de los seguir.", + "enable_web_push_notifications": "Activar las notificacions web push", "style": { "switcher": { "keep_color": "Gardar las colors", @@ -386,14 +408,14 @@ "days": "{0} jorns", "day_short": "{0} jorn", "days_short": "{0} jorns", - "hour": "{0} hour", - "hours": "{0} hours", + "hour": "{0} ora", + "hours": "{0} oras", "hour_short": "{0}h", "hours_short": "{0}h", - "in_future": "in {0}", + "in_future": "d’aquí {0}", "in_past": "fa {0}", - "minute": "{0} minute", - "minutes": "{0} minutes", + "minute": "{0} minuta", + "minutes": "{0} minutas", "minute_short": "{0}min", "minutes_short": "{0}min", "month": "{0} mes", @@ -402,12 +424,12 @@ "months_short": "{0} meses", "now": "ara meteis", "now_short": "ara meteis", - "second": "{0} second", - "seconds": "{0} seconds", + "second": "{0} segonda", + "seconds": "{0} segondas", "second_short": "{0}s", "seconds_short": "{0}s", - "week": "{0} setm.", - "weeks": "{0} setm.", + "week": "{0} setmana.", + "weeks": "{0} setmanas.", "week_short": "{0} setm.", "weeks_short": "{0} setm.", "year": "{0} an", |