Merge branch 'develop' into update-changelog
ci/woodpecker/pr/woodpecker Pipeline was successful
Details
ci/woodpecker/pr/woodpecker Pipeline was successful
Details
This commit is contained in:
commit
87b8925c9a
|
|
@ -1,47 +0,0 @@
|
|||
# This file is a template, and might need editing before it works on your project.
|
||||
# Official framework image. Look for the different tagged releases at:
|
||||
# https://hub.docker.com/r/library/node/tags/
|
||||
image: node:12
|
||||
|
||||
stages:
|
||||
- lint
|
||||
- build
|
||||
- test
|
||||
- deploy
|
||||
|
||||
lint:
|
||||
stage: lint
|
||||
script:
|
||||
- yarn
|
||||
- npm run lint
|
||||
- npm run stylelint
|
||||
|
||||
test:
|
||||
stage: test
|
||||
variables:
|
||||
APT_CACHE_DIR: apt-cache
|
||||
script:
|
||||
- mkdir -pv $APT_CACHE_DIR && apt-get -qq update
|
||||
- apt install firefox-esr -y --no-install-recommends
|
||||
- firefox --version
|
||||
- yarn
|
||||
- yarn unit
|
||||
|
||||
build:
|
||||
stage: build
|
||||
script:
|
||||
- yarn
|
||||
- npm run build
|
||||
artifacts:
|
||||
paths:
|
||||
- dist/
|
||||
|
||||
docs-deploy:
|
||||
stage: deploy
|
||||
image: alpine:latest
|
||||
only:
|
||||
- develop@pleroma/pleroma-fe
|
||||
before_script:
|
||||
- apk add curl
|
||||
script:
|
||||
- curl -X POST -F"token=$DOCS_PIPELINE_TRIGGER" -F'ref=master' https://git.pleroma.social/api/v4/projects/673/trigger/pipeline
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
"qrcode": "1",
|
||||
"ruffle-mirror": "2021.12.31",
|
||||
"vue": "^3.2.31",
|
||||
"vue-i18n": "^9.2.0-beta.39",
|
||||
"vue-i18n": "^9.2.2",
|
||||
"vue-router": "4.0.14",
|
||||
"vue-template-compiler": "2.6.11",
|
||||
"vuex": "4.0.2"
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
v-if="status.translation"
|
||||
class="translation"
|
||||
>
|
||||
<h4>{{ $t('status.translated_from', { language: status.translation.detected_language }) }}</h4>
|
||||
<h4>{{ $t(`languages.translated_from.${status.translation.detected_language.toLowerCase()}`) }}</h4>
|
||||
<RichContent
|
||||
:class="{ '-single-line': singleLine }"
|
||||
class="text media-body"
|
||||
|
|
@ -85,7 +85,7 @@
|
|||
:key="language.key"
|
||||
:value="language.value"
|
||||
>
|
||||
{{ language.label }}
|
||||
{{ $t(`languages.${language.value.toLowerCase()}`) }}
|
||||
</option>
|
||||
</Select>
|
||||
{{ ' ' }}
|
||||
|
|
|
|||
|
|
@ -164,6 +164,74 @@
|
|||
"load_older": "Load older interactions",
|
||||
"moves": "User migrates"
|
||||
},
|
||||
"languages": {
|
||||
"bg": "Bulgarian",
|
||||
"en": "English",
|
||||
"ar": "Arabic",
|
||||
"az": "Azerbaijani",
|
||||
"zh": "Chinese",
|
||||
"cs": "Czech",
|
||||
"da": "Danish",
|
||||
"nl": "Dutch",
|
||||
"eo": "Esperanto",
|
||||
"fi": "Finnish",
|
||||
"fr": "French",
|
||||
"de": "German",
|
||||
"el": "Greek",
|
||||
"he": "Hebrew",
|
||||
"hi": "Hindi",
|
||||
"hu": "Hungarian",
|
||||
"id": "Indonesian",
|
||||
"ga": "Irish",
|
||||
"it": "Italian",
|
||||
"ja": "Japanese",
|
||||
"ko": "Korean",
|
||||
"fa": "Persian",
|
||||
"pl": "Polish",
|
||||
"pt": "Portuguese",
|
||||
"ru": "Russian",
|
||||
"sk": "Slovak",
|
||||
"es": "Spanish",
|
||||
"sv": "Swedish",
|
||||
"tr": "Turkish",
|
||||
"uk": "Ukrainian",
|
||||
"lt": "Lithuanian",
|
||||
"lv": "Latvian",
|
||||
"translated_from": {
|
||||
"bg": "Translated from @:languages.bg",
|
||||
"en": "Translated from @:languages.en",
|
||||
"ar": "Translated from @:languages.ar",
|
||||
"az": "Translated from @:languages.az",
|
||||
"zh": "Translated from @:languages.zh",
|
||||
"cs": "Translated from @:languages.cs",
|
||||
"da": "Translated from @:languages.da",
|
||||
"nl": "Translated from @:languages.nl",
|
||||
"eo": "Translated from @:languages.eo",
|
||||
"fi": "Translated from @:languages.fi",
|
||||
"fr": "Translated from @:languages.fr",
|
||||
"de": "Translated from @:languages.de",
|
||||
"el": "Translated from @:languages.el",
|
||||
"he": "Translated from @:languages.he",
|
||||
"hi": "Translated from @:languages.hi",
|
||||
"hu": "Translated from @:languages.hu",
|
||||
"id": "Translated from @:languages.id",
|
||||
"ga": "Translated from @:languages.ga",
|
||||
"it": "Translated from @:languages.it",
|
||||
"ja": "Translated from @:languages.ja",
|
||||
"ko": "Translated from @:languages.ko",
|
||||
"fa": "Translated from @:languages.fa",
|
||||
"pl": "Translated from @:languages.pl",
|
||||
"pt": "Translated from @:languages.pt",
|
||||
"ru": "Translated from @:languages.ru",
|
||||
"sk": "Translated from @:languages.sk",
|
||||
"es": "Translated from @:languages.es",
|
||||
"sv": "Translated from @:languages.sv",
|
||||
"tr": "Translated from @:languages.tr",
|
||||
"uk": "Translated from @:languages.uk",
|
||||
"lt": "Translated from @:languages.lt",
|
||||
"lv": "Translated from @:languages.lv"
|
||||
}
|
||||
},
|
||||
"lists": {
|
||||
"create": "Create",
|
||||
"delete": "Delete list",
|
||||
|
|
@ -283,10 +351,10 @@
|
|||
"default": "Just arrived at Luna Nova Academy",
|
||||
"direct_warning_to_all": "This post will be visible to all the mentioned users.",
|
||||
"direct_warning_to_first_only": "This post will only be visible to the mentioned users at the beginning of the message.",
|
||||
"empty_status_error": "Can't send a post with no content and no files",
|
||||
"edit_remote_warning": "Changes made to the post may not be visible on some instances!",
|
||||
"edit_status": "Edit Status",
|
||||
"edit_remote_warning": "Other instances may not support edits!",
|
||||
"edit_unsupported_warning": "Polls and mentions will not be changed by editing.",
|
||||
"empty_status_error": "Can't send a post with no content and no files",
|
||||
"media_description": "Media description",
|
||||
"media_description_error": "Failed to update media, try again",
|
||||
"media_not_sensitive_warning": "You have a Content Warning, but the attachments are not marked as sensitive!",
|
||||
|
|
@ -837,9 +905,9 @@
|
|||
"delete_confirm_cancel_button": "No, keep it",
|
||||
"delete_confirm_title": "Confirm deletion",
|
||||
"edit": "Edit",
|
||||
"edited_at": "Edited {time}",
|
||||
"edit_history": "Edit History",
|
||||
"edit_history_modal_title": "Edited {historyCount} time | Edited {historyCount} times",
|
||||
"edited_at": "Edited {time}",
|
||||
"expand": "Expand",
|
||||
"external_source": "External source",
|
||||
"favorites": "Favorites",
|
||||
|
|
|
|||
|
|
@ -279,10 +279,12 @@
|
|||
"text/plain": "Texte brut",
|
||||
"text/x.misskeymarkdown": "Markdown (Misskey)"
|
||||
},
|
||||
"content_warning": "Sujet (optionnel)",
|
||||
"content_warning": "Avertissement (optionnel)",
|
||||
"default": "Je viens d'arriver au QG de la NERV",
|
||||
"direct_warning_to_all": "Ce message sera visible pour toutes les personnes mentionnées.",
|
||||
"direct_warning_to_first_only": "Ce message sera visible uniquement pour personnes mentionnées au début du message.",
|
||||
"edit_remote_warning": "Les modifications apportées au status pourraient ne pas être visible sur certaines instances !",
|
||||
"edit_status": "Modifier le statut",
|
||||
"empty_status_error": "Impossible de publier un statut vide sans pièces-jointes",
|
||||
"media_description": "Description de la pièce-jointe",
|
||||
"media_description_error": "Échec de téléversement du media, essayez encore",
|
||||
|
|
|
|||
|
|
@ -164,6 +164,14 @@
|
|||
"load_older": "古いインタラクションを見る",
|
||||
"moves": "ユーザーの引っ越し"
|
||||
},
|
||||
"languages": {
|
||||
"en": "英語",
|
||||
"ja": "日本語",
|
||||
"zh": "中国語",
|
||||
"translated_from": {
|
||||
"en": "英語から翻訳しました"
|
||||
}
|
||||
},
|
||||
"lists": {
|
||||
"create": "作成",
|
||||
"delete": "削除",
|
||||
|
|
@ -279,10 +287,13 @@
|
|||
"text/plain": "プレーンテキスト",
|
||||
"text/x.misskeymarkdown": "MFM"
|
||||
},
|
||||
"content_warning": "説明 (省略可)",
|
||||
"default": "羽田空港に着きました。",
|
||||
"content_warning": "警告 (省略可)",
|
||||
"default": "ただいまルーナノヴァ魔法学校に到着しました",
|
||||
"direct_warning_to_all": "この投稿は、メンションされたすべてのユーザーが、見ることができます。",
|
||||
"direct_warning_to_first_only": "この投稿は、メッセージの冒頭でメンションされたユーザーだけが、見ることができます。",
|
||||
"edit_remote_warning": "注意：リモートインスタンスには、編集した投稿が見えないかもしれません",
|
||||
"edit_status": "編集",
|
||||
"edit_unsupported_warning": "編集しても投票やメンションが更新されません",
|
||||
"empty_status_error": "投稿内容を入力してください",
|
||||
"media_description": "メディアの説明",
|
||||
"media_description_error": "メディアのアップロードに失敗しました。もう一度お試しください",
|
||||
|
|
@ -392,7 +403,7 @@
|
|||
"changed_password": "パスワードが、変わりました！",
|
||||
"chatMessageRadius": "チャットメッセージ",
|
||||
"checkboxRadius": "チェックボックス",
|
||||
"collapse_subject": "説明のある投稿をたたむ",
|
||||
"collapse_subject": "警告のある投稿をたたむ",
|
||||
"columns": "カラム",
|
||||
"composing": "投稿",
|
||||
"confirm_dialogs": "選択しているアクションは確認必要があります",
|
||||
|
|
@ -614,7 +625,7 @@
|
|||
"security": "セキュリティ",
|
||||
"security_tab": "セキュリティ",
|
||||
"sensitive_by_default": "はじめから投稿をセンシティブとして設定",
|
||||
"sensitive_if_subject": "投稿にサブジェクトをついたらNSFWにする",
|
||||
"sensitive_if_subject": "投稿に警告をついたらNSFWにする",
|
||||
"set_new_avatar": "新しいアバターを設定する",
|
||||
"set_new_mascot": "マスコットを更新",
|
||||
"set_new_profile_background": "新しいプロフィールのバックグラウンドを設定する",
|
||||
|
|
@ -710,7 +721,7 @@
|
|||
"fine_print": "私たちの{0}を、読まないでください！",
|
||||
"header": "プレビュー",
|
||||
"header_faint": "エラーではありません",
|
||||
"input": "羽田空港に着きました。",
|
||||
"input": "ただいまルーナノヴァ魔法学校に到着しました",
|
||||
"link": "ハイパーリンク",
|
||||
"mono": "monospace",
|
||||
"text": "これは{0}と{1}の例です"
|
||||
|
|
@ -777,9 +788,9 @@
|
|||
"use_source": "新しいバージョン"
|
||||
}
|
||||
},
|
||||
"subject_input_always_show": "サブジェクトフィールドをいつでも表示する",
|
||||
"subject_line_behavior": "返信するときサブジェクトをコピーする",
|
||||
"subject_line_email": "メール風: \"re: サブジェクト\"",
|
||||
"subject_input_always_show": "警告入力をいつでも表示する",
|
||||
"subject_line_behavior": "返信するとき警告をコピーする",
|
||||
"subject_line_email": "メール風: \"re: 警告\"",
|
||||
"subject_line_mastodon": "マストドン風: そのままコピー",
|
||||
"subject_line_noop": "コピーしない",
|
||||
"text": "文字",
|
||||
|
|
@ -833,12 +844,16 @@
|
|||
"delete_confirm_accept_button": "削除",
|
||||
"delete_confirm_cancel_button": "キャンセル",
|
||||
"delete_confirm_title": "削除を確認してください",
|
||||
"edit": "編集",
|
||||
"edit_history": "編集履歴",
|
||||
"edit_history_modal_title": "{historyCount}回編集",
|
||||
"edited_at": "{time}に編集",
|
||||
"expand": "広げる",
|
||||
"external_source": "外部ソース",
|
||||
"favorites": "お気に入り",
|
||||
"hide_attachment": "ファイルを隠す",
|
||||
"hide_content": "隠す",
|
||||
"hide_full_subject": "隠す",
|
||||
"hide_full_subject": "警告を隠す",
|
||||
"many_attachments": "ファイルは{number}件があります",
|
||||
"mentions": "メンション",
|
||||
"move_down": "右に移動",
|
||||
|
|
@ -865,7 +880,7 @@
|
|||
"show_attachment_description": "説明の略を見る",
|
||||
"show_attachment_in_modal": "ファイルをウインドウで見る",
|
||||
"show_content": "見る",
|
||||
"show_full_subject": "全部見る",
|
||||
"show_full_subject": "警告を見る",
|
||||
"show_only_conversation_under_this": "この投稿を返信する投稿のみ",
|
||||
"status_deleted": "この投稿は削除されました",
|
||||
"status_unavailable": "利用できません",
|
||||
|
|
|
|||
67
yarn.lock
67
yarn.lock
|
|
@ -1156,24 +1156,32 @@
|
|||
source-map "0.6.1"
|
||||
yaml-eslint-parser "^0.3.2"
|
||||
|
||||
"@intlify/core-base@9.2.0-beta.40":
|
||||
version "9.2.0-beta.40"
|
||||
resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.2.0-beta.40.tgz#85df2e183b2102716c5d40795848fc2359354580"
|
||||
integrity sha512-vOR0lHgtJ3IkzvXLeMQeNeYreFSKG9v3SU8QOD//WKHdBy4QPISs9CZJkYzBeBVCJVZ/eM6OTSbXF8M2k53iCw==
|
||||
"@intlify/core-base@9.2.2":
|
||||
version "9.2.2"
|
||||
resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.2.2.tgz#5353369b05cc9fe35cab95fe20afeb8a4481f939"
|
||||
integrity sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==
|
||||
dependencies:
|
||||
"@intlify/devtools-if" "9.2.0-beta.40"
|
||||
"@intlify/message-compiler" "9.2.0-beta.40"
|
||||
"@intlify/shared" "9.2.0-beta.40"
|
||||
"@intlify/vue-devtools" "9.2.0-beta.40"
|
||||
"@intlify/devtools-if" "9.2.2"
|
||||
"@intlify/message-compiler" "9.2.2"
|
||||
"@intlify/shared" "9.2.2"
|
||||
"@intlify/vue-devtools" "9.2.2"
|
||||
|
||||
"@intlify/devtools-if@9.2.0-beta.40":
|
||||
version "9.2.0-beta.40"
|
||||
resolved "https://registry.yarnpkg.com/@intlify/devtools-if/-/devtools-if-9.2.0-beta.40.tgz#bee42fefaaaa590aa5ac7fe2a98777fb84bfaf5e"
|
||||
integrity sha512-EUiuLxlgortD1dhT0btm3YYIs2vk9kMdcGXiYYbHWRTylc8Iv7Yz47y5Y+IlbZzk51h/nYvuqXE1h9diZZWAvQ==
|
||||
"@intlify/devtools-if@9.2.2":
|
||||
version "9.2.2"
|
||||
resolved "https://registry.yarnpkg.com/@intlify/devtools-if/-/devtools-if-9.2.2.tgz#b13d9ac4b4e2fe6d2e7daa556517a8061fe8bd39"
|
||||
integrity sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==
|
||||
dependencies:
|
||||
"@intlify/shared" "9.2.0-beta.40"
|
||||
"@intlify/shared" "9.2.2"
|
||||
|
||||
"@intlify/message-compiler@9.2.0-beta.40", "@intlify/message-compiler@next":
|
||||
"@intlify/message-compiler@9.2.2":
|
||||
version "9.2.2"
|
||||
resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.2.2.tgz#e42ab6939b8ae5b3d21faf6a44045667a18bba1c"
|
||||
integrity sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==
|
||||
dependencies:
|
||||
"@intlify/shared" "9.2.2"
|
||||
source-map "0.6.1"
|
||||
|
||||
"@intlify/message-compiler@next":
|
||||
version "9.2.0-beta.40"
|
||||
resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.2.0-beta.40.tgz#d5d0c5652b9e74e0b4da07a2b8731e1f0e729029"
|
||||
integrity sha512-6QWTSYewmkew4nsRqgkwTVuGFKzxVCOK8EXsPt15N+tN1g+OYjC3PfGA2dPB6cVkNxqA9mV/hNK02uHPWU9t0A==
|
||||
|
|
@ -1186,13 +1194,18 @@
|
|||
resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.2.0-beta.40.tgz#a850936008e6e865310b2a49136d494dd326faab"
|
||||
integrity sha512-xWz+SFjgt/LfaSbbHVn+V7gmvX4ZNP3cIFta790GWZ/tEgwJeC3tkV7i45iUbZ4ZimOerFgKH05b7qvJlKb6RQ==
|
||||
|
||||
"@intlify/vue-devtools@9.2.0-beta.40":
|
||||
version "9.2.0-beta.40"
|
||||
resolved "https://registry.yarnpkg.com/@intlify/vue-devtools/-/vue-devtools-9.2.0-beta.40.tgz#37457fd719b0b6afb0679c33ceb47b0ac77f457c"
|
||||
integrity sha512-3A0D/E9quf+KWonzXUDk3xNP0+d1DMdtAwyXNTjzFcQPvjugC2Xn6fmsd0kNn7nHjgpB+vwIuamGiuE+S+OULw==
|
||||
"@intlify/shared@9.2.2":
|
||||
version "9.2.2"
|
||||
resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.2.2.tgz#5011be9ca2b4ab86f8660739286e2707f9abb4a5"
|
||||
integrity sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==
|
||||
|
||||
"@intlify/vue-devtools@9.2.2":
|
||||
version "9.2.2"
|
||||
resolved "https://registry.yarnpkg.com/@intlify/vue-devtools/-/vue-devtools-9.2.2.tgz#b95701556daf7ebb3a2d45aa3ae9e6415aed8317"
|
||||
integrity sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg==
|
||||
dependencies:
|
||||
"@intlify/core-base" "9.2.0-beta.40"
|
||||
"@intlify/shared" "9.2.0-beta.40"
|
||||
"@intlify/core-base" "9.2.2"
|
||||
"@intlify/shared" "9.2.2"
|
||||
|
||||
"@intlify/vue-i18n-loader@^5.0.0":
|
||||
version "5.0.0"
|
||||
|
|
@ -11415,14 +11428,14 @@ vue-eslint-parser@^5.0.0:
|
|||
esquery "^1.0.1"
|
||||
lodash "^4.17.11"
|
||||
|
||||
vue-i18n@^9.2.0-beta.39:
|
||||
version "9.2.0-beta.40"
|
||||
resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-9.2.0-beta.40.tgz#8088b19d619f47bf0e0f529f9bd1413460f2ff56"
|
||||
integrity sha512-UwcGsbTTaDJry6BbFFzt115EVHN/bXi07DyUIZ4zrYeGMBPp2QAptMwVaGUQid1gaMmUreAKarGIqw46oCQEvg==
|
||||
vue-i18n@^9.2.2:
|
||||
version "9.2.2"
|
||||
resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-9.2.2.tgz#aeb49d9424923c77e0d6441e3f21dafcecd0e666"
|
||||
integrity sha512-yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ==
|
||||
dependencies:
|
||||
"@intlify/core-base" "9.2.0-beta.40"
|
||||
"@intlify/shared" "9.2.0-beta.40"
|
||||
"@intlify/vue-devtools" "9.2.0-beta.40"
|
||||
"@intlify/core-base" "9.2.2"
|
||||
"@intlify/shared" "9.2.2"
|
||||
"@intlify/vue-devtools" "9.2.2"
|
||||
"@vue/devtools-api" "^6.2.1"
|
||||
|
||||
vue-loader@^16.0.0:
|
||||
|
|
|
|||
Loading…
Reference in New Issue