Compare commits
22 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
90429b787c | ||
![]() |
7a2ef04ec3 | ||
![]() |
76a9ea8d3d | ||
![]() |
0a05a2d060 | ||
![]() |
a7e2ee3b0c | ||
![]() |
40efa90dd5 | ||
![]() |
4ca0a22bfc | ||
![]() |
20a943b193 | ||
![]() |
552df8737d | ||
![]() |
860f622d79 | ||
![]() |
e76bf5707a | ||
![]() |
bf37a72f59 | ||
![]() |
840ad75830 | ||
![]() |
4c7dd7228f | ||
![]() |
46a51addad | ||
![]() |
0a5fe37025 | ||
![]() |
00bb403497 | ||
![]() |
11afa8140c | ||
![]() |
850396e9da | ||
![]() |
5ee75be49e | ||
![]() |
879116a20c | ||
![]() |
e509b1f488 |
@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
|
|||||||
destroy: "アンケートを破棄"
|
destroy: "アンケートを破棄"
|
||||||
common/views/components/reaction-picker.vue:
|
common/views/components/reaction-picker.vue:
|
||||||
choose-reaction: "リアクションを選択"
|
choose-reaction: "リアクションを選択"
|
||||||
|
common/views/components/emoji-picker.vue:
|
||||||
|
custom-emoji: "カスタム絵文字"
|
||||||
|
people: "人"
|
||||||
|
animals-and-nature: "動物&自然"
|
||||||
|
food-and-drink: "食べ物&飲み物"
|
||||||
|
activity: "アクティビティ"
|
||||||
|
travel-and-places: "場所"
|
||||||
|
objects: "物"
|
||||||
|
symbols: "記号"
|
||||||
|
flags: "旗"
|
||||||
common/views/components/signin.vue:
|
common/views/components/signin.vue:
|
||||||
username: "ユーザー名"
|
username: "ユーザー名"
|
||||||
password: "パスワード"
|
password: "パスワード"
|
||||||
@@ -588,12 +598,6 @@ desktop/views/components/media-image.vue:
|
|||||||
desktop/views/components/media-video.vue:
|
desktop/views/components/media-video.vue:
|
||||||
sensitive: "閲覧注意"
|
sensitive: "閲覧注意"
|
||||||
click-to-show: "クリックして表示"
|
click-to-show: "クリックして表示"
|
||||||
desktop/views/components/follow-button.vue:
|
|
||||||
following: "フォロー中"
|
|
||||||
follow: "フォロー"
|
|
||||||
request-pending: "フォロー許可待ち"
|
|
||||||
follow-processing: "フォロー処理中"
|
|
||||||
follow-request: "フォロー申請"
|
|
||||||
desktop/views/components/followers-window.vue:
|
desktop/views/components/followers-window.vue:
|
||||||
followers: "{} のフォロワー"
|
followers: "{} のフォロワー"
|
||||||
desktop/views/components/followers.vue:
|
desktop/views/components/followers.vue:
|
||||||
@@ -829,6 +833,10 @@ common/views/components/mute-and-block.vue:
|
|||||||
block: "ブロック"
|
block: "ブロック"
|
||||||
no-muted-users: "ミュートしているユーザーはいません"
|
no-muted-users: "ミュートしているユーザーはいません"
|
||||||
no-blocked-users: "ブロックしているユーザーはいません"
|
no-blocked-users: "ブロックしているユーザーはいません"
|
||||||
|
word-mute: "ワードミュート"
|
||||||
|
muted-words: "ミュートされたキーワード"
|
||||||
|
muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
|
||||||
|
save: "保存"
|
||||||
common/views/components/password-settings.vue:
|
common/views/components/password-settings.vue:
|
||||||
reset: "パスワードを変更する"
|
reset: "パスワードを変更する"
|
||||||
enter-current-password: "現在のパスワードを入力してください"
|
enter-current-password: "現在のパスワードを入力してください"
|
||||||
@@ -1161,7 +1169,7 @@ mobile/views/components/media-image.vue:
|
|||||||
mobile/views/components/media-video.vue:
|
mobile/views/components/media-video.vue:
|
||||||
sensitive: "閲覧注意"
|
sensitive: "閲覧注意"
|
||||||
click-to-show: "クリックして表示"
|
click-to-show: "クリックして表示"
|
||||||
mobile/views/components/follow-button.vue:
|
common/views/components/follow-button.vue:
|
||||||
following: "フォロー中"
|
following: "フォロー中"
|
||||||
follow: "フォロー"
|
follow: "フォロー"
|
||||||
request-pending: "フォロー許可待ち"
|
request-pending: "フォロー許可待ち"
|
||||||
|
@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
|
|||||||
destroy: "Diese Abstimmung löschen"
|
destroy: "Diese Abstimmung löschen"
|
||||||
common/views/components/reaction-picker.vue:
|
common/views/components/reaction-picker.vue:
|
||||||
choose-reaction: "Wähle eine Reaktion aus"
|
choose-reaction: "Wähle eine Reaktion aus"
|
||||||
|
common/views/components/emoji-picker.vue:
|
||||||
|
custom-emoji: "カスタム絵文字"
|
||||||
|
people: "人"
|
||||||
|
animals-and-nature: "動物&自然"
|
||||||
|
food-and-drink: "食べ物&飲み物"
|
||||||
|
activity: "アクティビティ"
|
||||||
|
travel-and-places: "場所"
|
||||||
|
objects: "物"
|
||||||
|
symbols: "記号"
|
||||||
|
flags: "旗"
|
||||||
common/views/components/signin.vue:
|
common/views/components/signin.vue:
|
||||||
username: "Benutzername"
|
username: "Benutzername"
|
||||||
password: "Passwort"
|
password: "Passwort"
|
||||||
@@ -588,12 +598,6 @@ desktop/views/components/media-image.vue:
|
|||||||
desktop/views/components/media-video.vue:
|
desktop/views/components/media-video.vue:
|
||||||
sensitive: "閲覧注意"
|
sensitive: "閲覧注意"
|
||||||
click-to-show: "クリックして表示"
|
click-to-show: "クリックして表示"
|
||||||
desktop/views/components/follow-button.vue:
|
|
||||||
following: "Folge ich"
|
|
||||||
follow: "Folgen"
|
|
||||||
request-pending: "Ausstehend"
|
|
||||||
follow-processing: "フォロー処理中"
|
|
||||||
follow-request: "Follower-Anfragen"
|
|
||||||
desktop/views/components/followers-window.vue:
|
desktop/views/components/followers-window.vue:
|
||||||
followers: "{} のフォロワー"
|
followers: "{} のフォロワー"
|
||||||
desktop/views/components/followers.vue:
|
desktop/views/components/followers.vue:
|
||||||
@@ -829,6 +833,10 @@ common/views/components/mute-and-block.vue:
|
|||||||
block: "ブロック"
|
block: "ブロック"
|
||||||
no-muted-users: "ミュートしているユーザーはいません"
|
no-muted-users: "ミュートしているユーザーはいません"
|
||||||
no-blocked-users: "ブロックしているユーザーはいません"
|
no-blocked-users: "ブロックしているユーザーはいません"
|
||||||
|
word-mute: "ワードミュート"
|
||||||
|
muted-words: "ミュートされたキーワード"
|
||||||
|
muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
|
||||||
|
save: "保存"
|
||||||
common/views/components/password-settings.vue:
|
common/views/components/password-settings.vue:
|
||||||
reset: "パスワードを変更する"
|
reset: "パスワードを変更する"
|
||||||
enter-current-password: "現在のパスワードを入力してください"
|
enter-current-password: "現在のパスワードを入力してください"
|
||||||
@@ -1161,7 +1169,7 @@ mobile/views/components/media-image.vue:
|
|||||||
mobile/views/components/media-video.vue:
|
mobile/views/components/media-video.vue:
|
||||||
sensitive: "閲覧注意"
|
sensitive: "閲覧注意"
|
||||||
click-to-show: "クリックして表示"
|
click-to-show: "クリックして表示"
|
||||||
mobile/views/components/follow-button.vue:
|
common/views/components/follow-button.vue:
|
||||||
following: "フォロー中"
|
following: "フォロー中"
|
||||||
follow: "フォロー"
|
follow: "フォロー"
|
||||||
request-pending: "フォロー許可待ち"
|
request-pending: "フォロー許可待ち"
|
||||||
|
@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
|
|||||||
destroy: "Discard the poll"
|
destroy: "Discard the poll"
|
||||||
common/views/components/reaction-picker.vue:
|
common/views/components/reaction-picker.vue:
|
||||||
choose-reaction: "Send a reaction"
|
choose-reaction: "Send a reaction"
|
||||||
|
common/views/components/emoji-picker.vue:
|
||||||
|
custom-emoji: "Custom Emoji"
|
||||||
|
people: "People"
|
||||||
|
animals-and-nature: "Animals & Nature"
|
||||||
|
food-and-drink: "Food & drink"
|
||||||
|
activity: "Activity"
|
||||||
|
travel-and-places: "Travel & Places"
|
||||||
|
objects: "Objects"
|
||||||
|
symbols: "Symbols"
|
||||||
|
flags: "Flags"
|
||||||
common/views/components/signin.vue:
|
common/views/components/signin.vue:
|
||||||
username: "Username"
|
username: "Username"
|
||||||
password: "Password"
|
password: "Password"
|
||||||
@@ -588,12 +598,6 @@ desktop/views/components/media-image.vue:
|
|||||||
desktop/views/components/media-video.vue:
|
desktop/views/components/media-video.vue:
|
||||||
sensitive: "The content is NSFW"
|
sensitive: "The content is NSFW"
|
||||||
click-to-show: "Click to show"
|
click-to-show: "Click to show"
|
||||||
desktop/views/components/follow-button.vue:
|
|
||||||
following: "Following"
|
|
||||||
follow: "Follow"
|
|
||||||
request-pending: "Pending follow request"
|
|
||||||
follow-processing: "Processing follow"
|
|
||||||
follow-request: "Follow request"
|
|
||||||
desktop/views/components/followers-window.vue:
|
desktop/views/components/followers-window.vue:
|
||||||
followers: "{}'s followers"
|
followers: "{}'s followers"
|
||||||
desktop/views/components/followers.vue:
|
desktop/views/components/followers.vue:
|
||||||
@@ -829,6 +833,10 @@ common/views/components/mute-and-block.vue:
|
|||||||
block: "Blocking"
|
block: "Blocking"
|
||||||
no-muted-users: "No muted users"
|
no-muted-users: "No muted users"
|
||||||
no-blocked-users: "No blocked users"
|
no-blocked-users: "No blocked users"
|
||||||
|
word-mute: "Word mute"
|
||||||
|
muted-words: "Muted keywords"
|
||||||
|
muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
|
||||||
|
save: "Save"
|
||||||
common/views/components/password-settings.vue:
|
common/views/components/password-settings.vue:
|
||||||
reset: "Change password"
|
reset: "Change password"
|
||||||
enter-current-password: "Enter the current password"
|
enter-current-password: "Enter the current password"
|
||||||
@@ -1161,11 +1169,11 @@ mobile/views/components/media-image.vue:
|
|||||||
mobile/views/components/media-video.vue:
|
mobile/views/components/media-video.vue:
|
||||||
sensitive: "The content is NSFW"
|
sensitive: "The content is NSFW"
|
||||||
click-to-show: "Click to show"
|
click-to-show: "Click to show"
|
||||||
mobile/views/components/follow-button.vue:
|
common/views/components/follow-button.vue:
|
||||||
following: "Following"
|
following: "Following"
|
||||||
follow: "Follow"
|
follow: "Follow"
|
||||||
request-pending: "Pending follow request"
|
request-pending: "Pending"
|
||||||
follow-processing: "Processing follow"
|
follow-processing: "Processing"
|
||||||
follow-request: "Follow request"
|
follow-request: "Follow request"
|
||||||
mobile/views/components/friends-maker.vue:
|
mobile/views/components/friends-maker.vue:
|
||||||
title: "Let's follow them"
|
title: "Let's follow them"
|
||||||
|
@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
|
|||||||
destroy: "Cancelar la encuesta"
|
destroy: "Cancelar la encuesta"
|
||||||
common/views/components/reaction-picker.vue:
|
common/views/components/reaction-picker.vue:
|
||||||
choose-reaction: "Escoge una reacción"
|
choose-reaction: "Escoge una reacción"
|
||||||
|
common/views/components/emoji-picker.vue:
|
||||||
|
custom-emoji: "カスタム絵文字"
|
||||||
|
people: "人"
|
||||||
|
animals-and-nature: "動物&自然"
|
||||||
|
food-and-drink: "食べ物&飲み物"
|
||||||
|
activity: "アクティビティ"
|
||||||
|
travel-and-places: "場所"
|
||||||
|
objects: "物"
|
||||||
|
symbols: "記号"
|
||||||
|
flags: "旗"
|
||||||
common/views/components/signin.vue:
|
common/views/components/signin.vue:
|
||||||
username: "Usuario"
|
username: "Usuario"
|
||||||
password: "Contraseña"
|
password: "Contraseña"
|
||||||
@@ -588,12 +598,6 @@ desktop/views/components/media-image.vue:
|
|||||||
desktop/views/components/media-video.vue:
|
desktop/views/components/media-video.vue:
|
||||||
sensitive: "Este contenido no es apropiado para ver en el trabajo"
|
sensitive: "Este contenido no es apropiado para ver en el trabajo"
|
||||||
click-to-show: "Click para mostrar"
|
click-to-show: "Click para mostrar"
|
||||||
desktop/views/components/follow-button.vue:
|
|
||||||
following: "Siguiendo"
|
|
||||||
follow: "Sigue"
|
|
||||||
request-pending: "Pendiente de aprobación"
|
|
||||||
follow-processing: "フォロー処理中"
|
|
||||||
follow-request: "Solicitud de seguir"
|
|
||||||
desktop/views/components/followers-window.vue:
|
desktop/views/components/followers-window.vue:
|
||||||
followers: "{} seguidores"
|
followers: "{} seguidores"
|
||||||
desktop/views/components/followers.vue:
|
desktop/views/components/followers.vue:
|
||||||
@@ -829,6 +833,10 @@ common/views/components/mute-and-block.vue:
|
|||||||
block: "ブロック"
|
block: "ブロック"
|
||||||
no-muted-users: "ミュートしているユーザーはいません"
|
no-muted-users: "ミュートしているユーザーはいません"
|
||||||
no-blocked-users: "ブロックしているユーザーはいません"
|
no-blocked-users: "ブロックしているユーザーはいません"
|
||||||
|
word-mute: "ワードミュート"
|
||||||
|
muted-words: "ミュートされたキーワード"
|
||||||
|
muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
|
||||||
|
save: "保存"
|
||||||
common/views/components/password-settings.vue:
|
common/views/components/password-settings.vue:
|
||||||
reset: "パスワードを変更する"
|
reset: "パスワードを変更する"
|
||||||
enter-current-password: "現在のパスワードを入力してください"
|
enter-current-password: "現在のパスワードを入力してください"
|
||||||
@@ -1161,7 +1169,7 @@ mobile/views/components/media-image.vue:
|
|||||||
mobile/views/components/media-video.vue:
|
mobile/views/components/media-video.vue:
|
||||||
sensitive: "閲覧注意"
|
sensitive: "閲覧注意"
|
||||||
click-to-show: "クリックして表示"
|
click-to-show: "クリックして表示"
|
||||||
mobile/views/components/follow-button.vue:
|
common/views/components/follow-button.vue:
|
||||||
following: "フォロー中"
|
following: "フォロー中"
|
||||||
follow: "フォロー"
|
follow: "フォロー"
|
||||||
request-pending: "フォロー許可待ち"
|
request-pending: "フォロー許可待ち"
|
||||||
|
@@ -71,7 +71,7 @@ common:
|
|||||||
friday: "Vendredi"
|
friday: "Vendredi"
|
||||||
saturday: "Samedi"
|
saturday: "Samedi"
|
||||||
reactions:
|
reactions:
|
||||||
like: "J'aime"
|
like: "Bien"
|
||||||
love: "Adore"
|
love: "Adore"
|
||||||
laugh: "Rire"
|
laugh: "Rire"
|
||||||
hmm: "Hmm … ?"
|
hmm: "Hmm … ?"
|
||||||
@@ -85,8 +85,8 @@ common:
|
|||||||
public: "Public"
|
public: "Public"
|
||||||
home: "Principal"
|
home: "Principal"
|
||||||
home-desc: "Publier sur le fil principal uniquement"
|
home-desc: "Publier sur le fil principal uniquement"
|
||||||
followers: "Abonnés·es"
|
followers: "Abonné·e·s"
|
||||||
followers-desc: "Publier à vos abonnés·es uniquement"
|
followers-desc: "Publier à vos abonné·e·s uniquement"
|
||||||
specified: "Direct"
|
specified: "Direct"
|
||||||
specified-desc: "Publier uniquement aux utilisateurs·rices mentionnés·es"
|
specified-desc: "Publier uniquement aux utilisateurs·rices mentionnés·es"
|
||||||
private: "Privé"
|
private: "Privé"
|
||||||
@@ -99,7 +99,7 @@ common:
|
|||||||
f: "En attente de vos écrits"
|
f: "En attente de vos écrits"
|
||||||
search: "Recherche"
|
search: "Recherche"
|
||||||
delete: "Supprimer"
|
delete: "Supprimer"
|
||||||
loading: "Chargement"
|
loading: "Chargement en cours …"
|
||||||
ok: "OK"
|
ok: "OK"
|
||||||
update-available-title: "Mise à jour disponible"
|
update-available-title: "Mise à jour disponible"
|
||||||
update-available: "Une nouvelle version de Misskey est disponible ({newer}, version actuelle: {current}). Veuillez recharger la page pour appliquer la mise à jour."
|
update-available: "Une nouvelle version de Misskey est disponible ({newer}, version actuelle: {current}). Veuillez recharger la page pour appliquer la mise à jour."
|
||||||
@@ -117,8 +117,8 @@ common:
|
|||||||
this-setting-is-this-device-only: "Uniquement sur cet appareil"
|
this-setting-is-this-device-only: "Uniquement sur cet appareil"
|
||||||
use-os-default-emojis: "Utiliser les émojis standards du système"
|
use-os-default-emojis: "Utiliser les émojis standards du système"
|
||||||
do-not-use-in-production: 'Il s’agit d’une version de développement. Ne pas utiliser dans un environnement de production.'
|
do-not-use-in-production: 'Il s’agit d’une version de développement. Ne pas utiliser dans un environnement de production.'
|
||||||
is-remote-user: "Ces informations utilisateur ont été copiées."
|
is-remote-user: "Ces informations appartiennent à un·e utilisateur·rice distant·e."
|
||||||
is-remote-post: "Ceci est une publication distante"
|
is-remote-post: "Ceci est une publication distante."
|
||||||
view-on-remote: "Consulter le profil complet"
|
view-on-remote: "Consulter le profil complet"
|
||||||
error:
|
error:
|
||||||
title: 'Une erreur est survenue'
|
title: 'Une erreur est survenue'
|
||||||
@@ -151,7 +151,7 @@ common:
|
|||||||
notifications: "Notifications"
|
notifications: "Notifications"
|
||||||
users: "Utilisateur·rice·s"
|
users: "Utilisateur·rice·s"
|
||||||
polls: "Sondages"
|
polls: "Sondages"
|
||||||
post-form: "Formulaire de publication"
|
post-form: "Champs de publication"
|
||||||
server: "Info sur le serveur"
|
server: "Info sur le serveur"
|
||||||
donation: "Dons"
|
donation: "Dons"
|
||||||
nav: "Navigation"
|
nav: "Navigation"
|
||||||
@@ -166,7 +166,7 @@ auth/views/form.vue:
|
|||||||
account-write: "Modifications des informations du compte :"
|
account-write: "Modifications des informations du compte :"
|
||||||
note-write: "Publier."
|
note-write: "Publier."
|
||||||
like-write: "Réagir aux publications."
|
like-write: "Réagir aux publications."
|
||||||
following-write: "S'abonner et se désabonner."
|
following-write: "S’abonner et se désabonner."
|
||||||
drive-read: "Lire votre Drive"
|
drive-read: "Lire votre Drive"
|
||||||
drive-write: "Téléverser/supprimer des fichiers dans votre Drive."
|
drive-write: "Téléverser/supprimer des fichiers dans votre Drive."
|
||||||
notification-read: "Lire vos notifications."
|
notification-read: "Lire vos notifications."
|
||||||
@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
|
|||||||
destroy: "Annuler ce sondage"
|
destroy: "Annuler ce sondage"
|
||||||
common/views/components/reaction-picker.vue:
|
common/views/components/reaction-picker.vue:
|
||||||
choose-reaction: "Choisissez votre réaction"
|
choose-reaction: "Choisissez votre réaction"
|
||||||
|
common/views/components/emoji-picker.vue:
|
||||||
|
custom-emoji: "Émoji personnalisé"
|
||||||
|
people: "Personnes"
|
||||||
|
animals-and-nature: "Animaux et nature"
|
||||||
|
food-and-drink: "Nourriture et boisson"
|
||||||
|
activity: "Activités"
|
||||||
|
travel-and-places: "Lieux et voyages"
|
||||||
|
objects: "Objets"
|
||||||
|
symbols: "Symboles"
|
||||||
|
flags: "Drapeaux"
|
||||||
common/views/components/signin.vue:
|
common/views/components/signin.vue:
|
||||||
username: "Nom d'utilisateur·rice"
|
username: "Nom d'utilisateur·rice"
|
||||||
password: "Mot de passe"
|
password: "Mot de passe"
|
||||||
@@ -491,8 +501,8 @@ common/views/pages/follow.vue:
|
|||||||
following: "Suit"
|
following: "Suit"
|
||||||
follow: "Suivre"
|
follow: "Suivre"
|
||||||
request-pending: "Demande d'abonnement en attente"
|
request-pending: "Demande d'abonnement en attente"
|
||||||
follow-processing: "En cours d’abonnement"
|
follow-processing: "Demande en attente"
|
||||||
follow-request: "Demande d'abonnement"
|
follow-request: "Demande d’abonnement"
|
||||||
desktop:
|
desktop:
|
||||||
banner-crop-title: "Découpez la partie qui apparaitra comme bannière"
|
banner-crop-title: "Découpez la partie qui apparaitra comme bannière"
|
||||||
banner: "Bannière"
|
banner: "Bannière"
|
||||||
@@ -588,12 +598,6 @@ desktop/views/components/media-image.vue:
|
|||||||
desktop/views/components/media-video.vue:
|
desktop/views/components/media-video.vue:
|
||||||
sensitive: "Le contenu est NSFW"
|
sensitive: "Le contenu est NSFW"
|
||||||
click-to-show: "Cliquer pour afficher"
|
click-to-show: "Cliquer pour afficher"
|
||||||
desktop/views/components/follow-button.vue:
|
|
||||||
following: "Abonné·e"
|
|
||||||
follow: "Suivre"
|
|
||||||
request-pending: "En attente d'approbation"
|
|
||||||
follow-processing: "Continuer l’abonnement"
|
|
||||||
follow-request: "Demande d'abonnement"
|
|
||||||
desktop/views/components/followers-window.vue:
|
desktop/views/components/followers-window.vue:
|
||||||
followers: "{} abonné·e·s"
|
followers: "{} abonné·e·s"
|
||||||
desktop/views/components/followers.vue:
|
desktop/views/components/followers.vue:
|
||||||
@@ -829,6 +833,10 @@ common/views/components/mute-and-block.vue:
|
|||||||
block: "En cours blocage"
|
block: "En cours blocage"
|
||||||
no-muted-users: "Aucun utilisateur·rice n’est mis·e en sourdine"
|
no-muted-users: "Aucun utilisateur·rice n’est mis·e en sourdine"
|
||||||
no-blocked-users: "Aucun utilisateur·rice n’est bloqué·e"
|
no-blocked-users: "Aucun utilisateur·rice n’est bloqué·e"
|
||||||
|
word-mute: "Filtre de mots"
|
||||||
|
muted-words: "Mots masqués"
|
||||||
|
muted-words-description: "Description des mots mis en sourdine"
|
||||||
|
save: "Enregistrer"
|
||||||
common/views/components/password-settings.vue:
|
common/views/components/password-settings.vue:
|
||||||
reset: "Modifier le mot de passe"
|
reset: "Modifier le mot de passe"
|
||||||
enter-current-password: "Entrez votre mot de passe actuel"
|
enter-current-password: "Entrez votre mot de passe actuel"
|
||||||
@@ -1067,7 +1075,7 @@ desktop/views/pages/user-list.users.vue:
|
|||||||
desktop/views/pages/user/user.followers-you-know.vue:
|
desktop/views/pages/user/user.followers-you-know.vue:
|
||||||
title: "Abonné·e·s que vous connaissez"
|
title: "Abonné·e·s que vous connaissez"
|
||||||
loading: "Chargement en cours"
|
loading: "Chargement en cours"
|
||||||
no-users: "Pas d'utilisateurs"
|
no-users: "Aucun abonné connu"
|
||||||
desktop/views/pages/user/user.friends.vue:
|
desktop/views/pages/user/user.friends.vue:
|
||||||
title: "Mentions fréquentes"
|
title: "Mentions fréquentes"
|
||||||
loading: "Chargement en cours"
|
loading: "Chargement en cours"
|
||||||
@@ -1079,8 +1087,8 @@ desktop/views/pages/user/user.photos.vue:
|
|||||||
desktop/views/pages/user/user.profile.vue:
|
desktop/views/pages/user/user.profile.vue:
|
||||||
follows-you: "Vous suit"
|
follows-you: "Vous suit"
|
||||||
stalk: "Traquer"
|
stalk: "Traquer"
|
||||||
stalking: "ストーキングしています"
|
stalking: "Entrain de poursuivre"
|
||||||
unstalk: "ストーク解除"
|
unstalk: "Cesser la poursuite"
|
||||||
mute: "Mettre en sourdine"
|
mute: "Mettre en sourdine"
|
||||||
muted: "Muting"
|
muted: "Muting"
|
||||||
unmute: "Enlever la sourdine"
|
unmute: "Enlever la sourdine"
|
||||||
@@ -1161,12 +1169,12 @@ mobile/views/components/media-image.vue:
|
|||||||
mobile/views/components/media-video.vue:
|
mobile/views/components/media-video.vue:
|
||||||
sensitive: "Le contenu est NSFW"
|
sensitive: "Le contenu est NSFW"
|
||||||
click-to-show: "Cliquer pour afficher"
|
click-to-show: "Cliquer pour afficher"
|
||||||
mobile/views/components/follow-button.vue:
|
common/views/components/follow-button.vue:
|
||||||
following: "Abonné·e"
|
following: "Abonné·e"
|
||||||
follow: "Suivre"
|
follow: "S’abonner"
|
||||||
request-pending: "En attente d'approbation"
|
request-pending: "Demande en attente"
|
||||||
follow-processing: "En cours d’abonnement"
|
follow-processing: "フォロー処理中"
|
||||||
follow-request: "Demande d'abonnement"
|
follow-request: "フォロー申請"
|
||||||
mobile/views/components/friends-maker.vue:
|
mobile/views/components/friends-maker.vue:
|
||||||
title: "Abonnez-vous aux utilisateurs"
|
title: "Abonnez-vous aux utilisateurs"
|
||||||
empty: "Impossible de trouver des utilisateurs·trices à recommander."
|
empty: "Impossible de trouver des utilisateurs·trices à recommander."
|
||||||
@@ -1219,7 +1227,7 @@ mobile/views/components/ui.header.vue:
|
|||||||
mobile/views/components/ui.nav.vue:
|
mobile/views/components/ui.nav.vue:
|
||||||
timeline: "Fil d'actualité"
|
timeline: "Fil d'actualité"
|
||||||
notifications: "Notifications"
|
notifications: "Notifications"
|
||||||
follow-requests: "Demandes d'abonnement"
|
follow-requests: "Demandes d’abonnement"
|
||||||
search: "Rechercher"
|
search: "Rechercher"
|
||||||
favorites: "Favoris"
|
favorites: "Favoris"
|
||||||
user-lists: "Listes"
|
user-lists: "Listes"
|
||||||
@@ -1267,8 +1275,8 @@ mobile/views/pages/widgets/activity.vue:
|
|||||||
mobile/views/pages/share.vue:
|
mobile/views/pages/share.vue:
|
||||||
share-with: "Partager avec {name}"
|
share-with: "Partager avec {name}"
|
||||||
mobile/views/pages/received-follow-requests.vue:
|
mobile/views/pages/received-follow-requests.vue:
|
||||||
title: "Demandes d'abonnement"
|
title: "Demandes d’abonnement"
|
||||||
accept: "Approuver"
|
accept: "Accepter"
|
||||||
reject: "Refuser"
|
reject: "Refuser"
|
||||||
mobile/views/pages/note.vue:
|
mobile/views/pages/note.vue:
|
||||||
title: "Post"
|
title: "Post"
|
||||||
@@ -1363,7 +1371,7 @@ mobile/views/pages/user/home.vue:
|
|||||||
followers-you-know: "Abonné·e·s que vous connaissez"
|
followers-you-know: "Abonné·e·s que vous connaissez"
|
||||||
last-used-at: "Dernière connexion il y a"
|
last-used-at: "Dernière connexion il y a"
|
||||||
mobile/views/pages/user/home.followers-you-know.vue:
|
mobile/views/pages/user/home.followers-you-know.vue:
|
||||||
no-users: "Pas d'utilisateurs"
|
no-users: "Aucun utilisateur connu"
|
||||||
mobile/views/pages/user/home.friends.vue:
|
mobile/views/pages/user/home.friends.vue:
|
||||||
no-users: "Pass d'utilisateurs"
|
no-users: "Pass d'utilisateurs"
|
||||||
mobile/views/pages/user/home.notes.vue:
|
mobile/views/pages/user/home.notes.vue:
|
||||||
|
@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
|
|||||||
destroy: "アンケートを破棄"
|
destroy: "アンケートを破棄"
|
||||||
common/views/components/reaction-picker.vue:
|
common/views/components/reaction-picker.vue:
|
||||||
choose-reaction: "リアクションを選択"
|
choose-reaction: "リアクションを選択"
|
||||||
|
common/views/components/emoji-picker.vue:
|
||||||
|
custom-emoji: "カスタム絵文字"
|
||||||
|
people: "人"
|
||||||
|
animals-and-nature: "動物&自然"
|
||||||
|
food-and-drink: "食べ物&飲み物"
|
||||||
|
activity: "アクティビティ"
|
||||||
|
travel-and-places: "場所"
|
||||||
|
objects: "物"
|
||||||
|
symbols: "記号"
|
||||||
|
flags: "旗"
|
||||||
common/views/components/signin.vue:
|
common/views/components/signin.vue:
|
||||||
username: "ユーザー名"
|
username: "ユーザー名"
|
||||||
password: "パスワード"
|
password: "パスワード"
|
||||||
@@ -588,12 +598,6 @@ desktop/views/components/media-image.vue:
|
|||||||
desktop/views/components/media-video.vue:
|
desktop/views/components/media-video.vue:
|
||||||
sensitive: "閲覧注意"
|
sensitive: "閲覧注意"
|
||||||
click-to-show: "クリックして表示"
|
click-to-show: "クリックして表示"
|
||||||
desktop/views/components/follow-button.vue:
|
|
||||||
following: "フォロー中"
|
|
||||||
follow: "フォロー"
|
|
||||||
request-pending: "フォロー許可待ち"
|
|
||||||
follow-processing: "フォロー処理中"
|
|
||||||
follow-request: "フォロー申請"
|
|
||||||
desktop/views/components/followers-window.vue:
|
desktop/views/components/followers-window.vue:
|
||||||
followers: "{} のフォロワー"
|
followers: "{} のフォロワー"
|
||||||
desktop/views/components/followers.vue:
|
desktop/views/components/followers.vue:
|
||||||
@@ -829,6 +833,10 @@ common/views/components/mute-and-block.vue:
|
|||||||
block: "ブロック"
|
block: "ブロック"
|
||||||
no-muted-users: "ミュートしているユーザーはいません"
|
no-muted-users: "ミュートしているユーザーはいません"
|
||||||
no-blocked-users: "ブロックしているユーザーはいません"
|
no-blocked-users: "ブロックしているユーザーはいません"
|
||||||
|
word-mute: "ワードミュート"
|
||||||
|
muted-words: "ミュートされたキーワード"
|
||||||
|
muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
|
||||||
|
save: "保存"
|
||||||
common/views/components/password-settings.vue:
|
common/views/components/password-settings.vue:
|
||||||
reset: "パスワードを変更する"
|
reset: "パスワードを変更する"
|
||||||
enter-current-password: "現在のパスワードを入力してください"
|
enter-current-password: "現在のパスワードを入力してください"
|
||||||
@@ -1161,7 +1169,7 @@ mobile/views/components/media-image.vue:
|
|||||||
mobile/views/components/media-video.vue:
|
mobile/views/components/media-video.vue:
|
||||||
sensitive: "閲覧注意"
|
sensitive: "閲覧注意"
|
||||||
click-to-show: "クリックして表示"
|
click-to-show: "クリックして表示"
|
||||||
mobile/views/components/follow-button.vue:
|
common/views/components/follow-button.vue:
|
||||||
following: "フォロー中"
|
following: "フォロー中"
|
||||||
follow: "フォロー"
|
follow: "フォロー"
|
||||||
request-pending: "フォロー許可待ち"
|
request-pending: "フォロー許可待ち"
|
||||||
|
@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
|
|||||||
destroy: "アンケートをほかそ"
|
destroy: "アンケートをほかそ"
|
||||||
common/views/components/reaction-picker.vue:
|
common/views/components/reaction-picker.vue:
|
||||||
choose-reaction: "リアクション、どれにするんや?"
|
choose-reaction: "リアクション、どれにするんや?"
|
||||||
|
common/views/components/emoji-picker.vue:
|
||||||
|
custom-emoji: "カスタム絵文字"
|
||||||
|
people: "人"
|
||||||
|
animals-and-nature: "動物&自然"
|
||||||
|
food-and-drink: "食べ物&飲み物"
|
||||||
|
activity: "アクティビティ"
|
||||||
|
travel-and-places: "場所"
|
||||||
|
objects: "物"
|
||||||
|
symbols: "記号"
|
||||||
|
flags: "旗"
|
||||||
common/views/components/signin.vue:
|
common/views/components/signin.vue:
|
||||||
username: "ユーザー名"
|
username: "ユーザー名"
|
||||||
password: "パスワード"
|
password: "パスワード"
|
||||||
@@ -588,12 +598,6 @@ desktop/views/components/media-image.vue:
|
|||||||
desktop/views/components/media-video.vue:
|
desktop/views/components/media-video.vue:
|
||||||
sensitive: "ちょっと見せられへんわ"
|
sensitive: "ちょっと見せられへんわ"
|
||||||
click-to-show: "クリックして見せるで"
|
click-to-show: "クリックして見せるで"
|
||||||
desktop/views/components/follow-button.vue:
|
|
||||||
following: "フォローしとる"
|
|
||||||
follow: "フォロー"
|
|
||||||
request-pending: "フォローの許し待っとる"
|
|
||||||
follow-processing: "今フォロー処理やっとる‥"
|
|
||||||
follow-request: "フォロー許してくれや!言うてみる"
|
|
||||||
desktop/views/components/followers-window.vue:
|
desktop/views/components/followers-window.vue:
|
||||||
followers: "{} のフォロワー"
|
followers: "{} のフォロワー"
|
||||||
desktop/views/components/followers.vue:
|
desktop/views/components/followers.vue:
|
||||||
@@ -829,6 +833,10 @@ common/views/components/mute-and-block.vue:
|
|||||||
block: "ブロック"
|
block: "ブロック"
|
||||||
no-muted-users: "ミュートしとるユーザーはおらんで"
|
no-muted-users: "ミュートしとるユーザーはおらんで"
|
||||||
no-blocked-users: "ブロックしとるユーザーはおらんで"
|
no-blocked-users: "ブロックしとるユーザーはおらんで"
|
||||||
|
word-mute: "ワードミュート"
|
||||||
|
muted-words: "ミュートされたキーワード"
|
||||||
|
muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
|
||||||
|
save: "保存"
|
||||||
common/views/components/password-settings.vue:
|
common/views/components/password-settings.vue:
|
||||||
reset: "パスワード変える"
|
reset: "パスワード変える"
|
||||||
enter-current-password: "今のパスワードを入れてや"
|
enter-current-password: "今のパスワードを入れてや"
|
||||||
@@ -1161,12 +1169,12 @@ mobile/views/components/media-image.vue:
|
|||||||
mobile/views/components/media-video.vue:
|
mobile/views/components/media-video.vue:
|
||||||
sensitive: "ちょっと見せられへんわ"
|
sensitive: "ちょっと見せられへんわ"
|
||||||
click-to-show: "押してみ、見せたるわ"
|
click-to-show: "押してみ、見せたるわ"
|
||||||
mobile/views/components/follow-button.vue:
|
common/views/components/follow-button.vue:
|
||||||
following: "フォローしとる"
|
following: "フォロー中"
|
||||||
follow: "フォロー"
|
follow: "フォロー"
|
||||||
request-pending: "フォローの許し待っとる"
|
request-pending: "フォロー許可待ち"
|
||||||
follow-processing: "今フォロー処理やっとる‥"
|
follow-processing: "フォロー処理中"
|
||||||
follow-request: "フォロー許してくれや!言うてみる"
|
follow-request: "フォロー申請"
|
||||||
mobile/views/components/friends-maker.vue:
|
mobile/views/components/friends-maker.vue:
|
||||||
title: "おもろそうやな"
|
title: "おもろそうやな"
|
||||||
empty: "おすすめのユーザーはおらん。"
|
empty: "おすすめのユーザーはおらん。"
|
||||||
|
@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
|
|||||||
destroy: "アンケートを破棄"
|
destroy: "アンケートを破棄"
|
||||||
common/views/components/reaction-picker.vue:
|
common/views/components/reaction-picker.vue:
|
||||||
choose-reaction: "リアクションを選択"
|
choose-reaction: "リアクションを選択"
|
||||||
|
common/views/components/emoji-picker.vue:
|
||||||
|
custom-emoji: "カスタム絵文字"
|
||||||
|
people: "人"
|
||||||
|
animals-and-nature: "動物&自然"
|
||||||
|
food-and-drink: "食べ物&飲み物"
|
||||||
|
activity: "アクティビティ"
|
||||||
|
travel-and-places: "場所"
|
||||||
|
objects: "物"
|
||||||
|
symbols: "記号"
|
||||||
|
flags: "旗"
|
||||||
common/views/components/signin.vue:
|
common/views/components/signin.vue:
|
||||||
username: "ユーザー名"
|
username: "ユーザー名"
|
||||||
password: "パスワード"
|
password: "パスワード"
|
||||||
@@ -588,12 +598,6 @@ desktop/views/components/media-image.vue:
|
|||||||
desktop/views/components/media-video.vue:
|
desktop/views/components/media-video.vue:
|
||||||
sensitive: "閲覧注意"
|
sensitive: "閲覧注意"
|
||||||
click-to-show: "クリックして表示"
|
click-to-show: "クリックして表示"
|
||||||
desktop/views/components/follow-button.vue:
|
|
||||||
following: "フォロー中"
|
|
||||||
follow: "フォロー"
|
|
||||||
request-pending: "フォロー許可待ち"
|
|
||||||
follow-processing: "フォロー処理中"
|
|
||||||
follow-request: "フォロー申請"
|
|
||||||
desktop/views/components/followers-window.vue:
|
desktop/views/components/followers-window.vue:
|
||||||
followers: "{} のフォロワー"
|
followers: "{} のフォロワー"
|
||||||
desktop/views/components/followers.vue:
|
desktop/views/components/followers.vue:
|
||||||
@@ -829,6 +833,10 @@ common/views/components/mute-and-block.vue:
|
|||||||
block: "ブロック"
|
block: "ブロック"
|
||||||
no-muted-users: "ミュートしているユーザーはいません"
|
no-muted-users: "ミュートしているユーザーはいません"
|
||||||
no-blocked-users: "ブロックしているユーザーはいません"
|
no-blocked-users: "ブロックしているユーザーはいません"
|
||||||
|
word-mute: "ワードミュート"
|
||||||
|
muted-words: "ミュートされたキーワード"
|
||||||
|
muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
|
||||||
|
save: "保存"
|
||||||
common/views/components/password-settings.vue:
|
common/views/components/password-settings.vue:
|
||||||
reset: "パスワードを変更する"
|
reset: "パスワードを変更する"
|
||||||
enter-current-password: "現在のパスワードを入力してください"
|
enter-current-password: "現在のパスワードを入力してください"
|
||||||
@@ -1161,7 +1169,7 @@ mobile/views/components/media-image.vue:
|
|||||||
mobile/views/components/media-video.vue:
|
mobile/views/components/media-video.vue:
|
||||||
sensitive: "閲覧注意"
|
sensitive: "閲覧注意"
|
||||||
click-to-show: "クリックして表示"
|
click-to-show: "クリックして表示"
|
||||||
mobile/views/components/follow-button.vue:
|
common/views/components/follow-button.vue:
|
||||||
following: "フォロー中"
|
following: "フォロー中"
|
||||||
follow: "フォロー"
|
follow: "フォロー"
|
||||||
request-pending: "フォロー許可待ち"
|
request-pending: "フォロー許可待ち"
|
||||||
|
@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
|
|||||||
destroy: "Deze peiling vernietigen"
|
destroy: "Deze peiling vernietigen"
|
||||||
common/views/components/reaction-picker.vue:
|
common/views/components/reaction-picker.vue:
|
||||||
choose-reaction: "Kies een reactie"
|
choose-reaction: "Kies een reactie"
|
||||||
|
common/views/components/emoji-picker.vue:
|
||||||
|
custom-emoji: "カスタム絵文字"
|
||||||
|
people: "人"
|
||||||
|
animals-and-nature: "動物&自然"
|
||||||
|
food-and-drink: "食べ物&飲み物"
|
||||||
|
activity: "アクティビティ"
|
||||||
|
travel-and-places: "場所"
|
||||||
|
objects: "物"
|
||||||
|
symbols: "記号"
|
||||||
|
flags: "旗"
|
||||||
common/views/components/signin.vue:
|
common/views/components/signin.vue:
|
||||||
username: "Gebruikersnaam"
|
username: "Gebruikersnaam"
|
||||||
password: "Wachtwoord"
|
password: "Wachtwoord"
|
||||||
@@ -588,12 +598,6 @@ desktop/views/components/media-image.vue:
|
|||||||
desktop/views/components/media-video.vue:
|
desktop/views/components/media-video.vue:
|
||||||
sensitive: "閲覧注意"
|
sensitive: "閲覧注意"
|
||||||
click-to-show: "クリックして表示"
|
click-to-show: "クリックして表示"
|
||||||
desktop/views/components/follow-button.vue:
|
|
||||||
following: "フォロー中"
|
|
||||||
follow: "Volgen"
|
|
||||||
request-pending: "フォロー許可待ち"
|
|
||||||
follow-processing: "フォロー処理中"
|
|
||||||
follow-request: "フォロー申請"
|
|
||||||
desktop/views/components/followers-window.vue:
|
desktop/views/components/followers-window.vue:
|
||||||
followers: "Volgers van {}"
|
followers: "Volgers van {}"
|
||||||
desktop/views/components/followers.vue:
|
desktop/views/components/followers.vue:
|
||||||
@@ -829,6 +833,10 @@ common/views/components/mute-and-block.vue:
|
|||||||
block: "ブロック"
|
block: "ブロック"
|
||||||
no-muted-users: "ミュートしているユーザーはいません"
|
no-muted-users: "ミュートしているユーザーはいません"
|
||||||
no-blocked-users: "ブロックしているユーザーはいません"
|
no-blocked-users: "ブロックしているユーザーはいません"
|
||||||
|
word-mute: "ワードミュート"
|
||||||
|
muted-words: "ミュートされたキーワード"
|
||||||
|
muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
|
||||||
|
save: "保存"
|
||||||
common/views/components/password-settings.vue:
|
common/views/components/password-settings.vue:
|
||||||
reset: "パスワードを変更する"
|
reset: "パスワードを変更する"
|
||||||
enter-current-password: "現在のパスワードを入力してください"
|
enter-current-password: "現在のパスワードを入力してください"
|
||||||
@@ -1161,9 +1169,9 @@ mobile/views/components/media-image.vue:
|
|||||||
mobile/views/components/media-video.vue:
|
mobile/views/components/media-video.vue:
|
||||||
sensitive: "閲覧注意"
|
sensitive: "閲覧注意"
|
||||||
click-to-show: "クリックして表示"
|
click-to-show: "クリックして表示"
|
||||||
mobile/views/components/follow-button.vue:
|
common/views/components/follow-button.vue:
|
||||||
following: "フォロー中"
|
following: "フォロー中"
|
||||||
follow: "Volgen"
|
follow: "フォロー"
|
||||||
request-pending: "フォロー許可待ち"
|
request-pending: "フォロー許可待ち"
|
||||||
follow-processing: "フォロー処理中"
|
follow-processing: "フォロー処理中"
|
||||||
follow-request: "フォロー申請"
|
follow-request: "フォロー申請"
|
||||||
|
@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
|
|||||||
destroy: "アンケートを破棄"
|
destroy: "アンケートを破棄"
|
||||||
common/views/components/reaction-picker.vue:
|
common/views/components/reaction-picker.vue:
|
||||||
choose-reaction: "リアクションを選択"
|
choose-reaction: "リアクションを選択"
|
||||||
|
common/views/components/emoji-picker.vue:
|
||||||
|
custom-emoji: "カスタム絵文字"
|
||||||
|
people: "人"
|
||||||
|
animals-and-nature: "動物&自然"
|
||||||
|
food-and-drink: "食べ物&飲み物"
|
||||||
|
activity: "アクティビティ"
|
||||||
|
travel-and-places: "場所"
|
||||||
|
objects: "物"
|
||||||
|
symbols: "記号"
|
||||||
|
flags: "旗"
|
||||||
common/views/components/signin.vue:
|
common/views/components/signin.vue:
|
||||||
username: "Brukernavn"
|
username: "Brukernavn"
|
||||||
password: "Passord"
|
password: "Passord"
|
||||||
@@ -588,12 +598,6 @@ desktop/views/components/media-image.vue:
|
|||||||
desktop/views/components/media-video.vue:
|
desktop/views/components/media-video.vue:
|
||||||
sensitive: "Innholdet er NSFW"
|
sensitive: "Innholdet er NSFW"
|
||||||
click-to-show: "クリックして表示"
|
click-to-show: "クリックして表示"
|
||||||
desktop/views/components/follow-button.vue:
|
|
||||||
following: "Følger"
|
|
||||||
follow: "Følg"
|
|
||||||
request-pending: "フォロー許可待ち"
|
|
||||||
follow-processing: "フォロー処理中"
|
|
||||||
follow-request: "フォロー申請"
|
|
||||||
desktop/views/components/followers-window.vue:
|
desktop/views/components/followers-window.vue:
|
||||||
followers: "{} のフォロワー"
|
followers: "{} のフォロワー"
|
||||||
desktop/views/components/followers.vue:
|
desktop/views/components/followers.vue:
|
||||||
@@ -829,6 +833,10 @@ common/views/components/mute-and-block.vue:
|
|||||||
block: "ブロック"
|
block: "ブロック"
|
||||||
no-muted-users: "ミュートしているユーザーはいません"
|
no-muted-users: "ミュートしているユーザーはいません"
|
||||||
no-blocked-users: "ブロックしているユーザーはいません"
|
no-blocked-users: "ブロックしているユーザーはいません"
|
||||||
|
word-mute: "ワードミュート"
|
||||||
|
muted-words: "ミュートされたキーワード"
|
||||||
|
muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
|
||||||
|
save: "保存"
|
||||||
common/views/components/password-settings.vue:
|
common/views/components/password-settings.vue:
|
||||||
reset: "パスワードを変更する"
|
reset: "パスワードを変更する"
|
||||||
enter-current-password: "現在のパスワードを入力してください"
|
enter-current-password: "現在のパスワードを入力してください"
|
||||||
@@ -1161,9 +1169,9 @@ mobile/views/components/media-image.vue:
|
|||||||
mobile/views/components/media-video.vue:
|
mobile/views/components/media-video.vue:
|
||||||
sensitive: "Innholdet er NSFW"
|
sensitive: "Innholdet er NSFW"
|
||||||
click-to-show: "クリックして表示"
|
click-to-show: "クリックして表示"
|
||||||
mobile/views/components/follow-button.vue:
|
common/views/components/follow-button.vue:
|
||||||
following: "Følger"
|
following: "フォロー中"
|
||||||
follow: "Følg"
|
follow: "フォロー"
|
||||||
request-pending: "フォロー許可待ち"
|
request-pending: "フォロー許可待ち"
|
||||||
follow-processing: "フォロー処理中"
|
follow-processing: "フォロー処理中"
|
||||||
follow-request: "フォロー申請"
|
follow-request: "フォロー申請"
|
||||||
|
@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
|
|||||||
destroy: "Usuń tę ankietę"
|
destroy: "Usuń tę ankietę"
|
||||||
common/views/components/reaction-picker.vue:
|
common/views/components/reaction-picker.vue:
|
||||||
choose-reaction: "Wybierz reakcję"
|
choose-reaction: "Wybierz reakcję"
|
||||||
|
common/views/components/emoji-picker.vue:
|
||||||
|
custom-emoji: "カスタム絵文字"
|
||||||
|
people: "人"
|
||||||
|
animals-and-nature: "動物&自然"
|
||||||
|
food-and-drink: "食べ物&飲み物"
|
||||||
|
activity: "アクティビティ"
|
||||||
|
travel-and-places: "場所"
|
||||||
|
objects: "物"
|
||||||
|
symbols: "記号"
|
||||||
|
flags: "旗"
|
||||||
common/views/components/signin.vue:
|
common/views/components/signin.vue:
|
||||||
username: "Nazwa użytkownika"
|
username: "Nazwa użytkownika"
|
||||||
password: "Hasło"
|
password: "Hasło"
|
||||||
@@ -588,12 +598,6 @@ desktop/views/components/media-image.vue:
|
|||||||
desktop/views/components/media-video.vue:
|
desktop/views/components/media-video.vue:
|
||||||
sensitive: "To jest zawartość NSFW"
|
sensitive: "To jest zawartość NSFW"
|
||||||
click-to-show: "Naciśnij aby wyświetlić"
|
click-to-show: "Naciśnij aby wyświetlić"
|
||||||
desktop/views/components/follow-button.vue:
|
|
||||||
following: "Śledzisz"
|
|
||||||
follow: "Śledź"
|
|
||||||
request-pending: "Oczekiwanie na pozwolenie"
|
|
||||||
follow-processing: "フォロー処理中"
|
|
||||||
follow-request: "Poproś o śledzenie"
|
|
||||||
desktop/views/components/followers-window.vue:
|
desktop/views/components/followers-window.vue:
|
||||||
followers: "Śledzący"
|
followers: "Śledzący"
|
||||||
desktop/views/components/followers.vue:
|
desktop/views/components/followers.vue:
|
||||||
@@ -829,6 +833,10 @@ common/views/components/mute-and-block.vue:
|
|||||||
block: "ブロック"
|
block: "ブロック"
|
||||||
no-muted-users: "ミュートしているユーザーはいません"
|
no-muted-users: "ミュートしているユーザーはいません"
|
||||||
no-blocked-users: "ブロックしているユーザーはいません"
|
no-blocked-users: "ブロックしているユーザーはいません"
|
||||||
|
word-mute: "ワードミュート"
|
||||||
|
muted-words: "ミュートされたキーワード"
|
||||||
|
muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
|
||||||
|
save: "保存"
|
||||||
common/views/components/password-settings.vue:
|
common/views/components/password-settings.vue:
|
||||||
reset: "パスワードを変更する"
|
reset: "パスワードを変更する"
|
||||||
enter-current-password: "現在のパスワードを入力してください"
|
enter-current-password: "現在のパスワードを入力してください"
|
||||||
@@ -1161,12 +1169,12 @@ mobile/views/components/media-image.vue:
|
|||||||
mobile/views/components/media-video.vue:
|
mobile/views/components/media-video.vue:
|
||||||
sensitive: "To jest zawartość NSFW"
|
sensitive: "To jest zawartość NSFW"
|
||||||
click-to-show: "Naciśnij aby wyświetlić"
|
click-to-show: "Naciśnij aby wyświetlić"
|
||||||
mobile/views/components/follow-button.vue:
|
common/views/components/follow-button.vue:
|
||||||
following: "Śledzisz"
|
following: "フォロー中"
|
||||||
follow: "Śledź"
|
follow: "フォロー"
|
||||||
request-pending: "Oczekiwanie na pozwolenie"
|
request-pending: "フォロー許可待ち"
|
||||||
follow-processing: "フォロー処理中"
|
follow-processing: "フォロー処理中"
|
||||||
follow-request: "Poproś o śledzenie"
|
follow-request: "フォロー申請"
|
||||||
mobile/views/components/friends-maker.vue:
|
mobile/views/components/friends-maker.vue:
|
||||||
title: "Zacznij śledzić ludzi takich jak Ty"
|
title: "Zacznij śledzić ludzi takich jak Ty"
|
||||||
empty: "Nie znaleziono podobnych użytkowników."
|
empty: "Nie znaleziono podobnych użytkowników."
|
||||||
|
@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
|
|||||||
destroy: "アンケートを破棄"
|
destroy: "アンケートを破棄"
|
||||||
common/views/components/reaction-picker.vue:
|
common/views/components/reaction-picker.vue:
|
||||||
choose-reaction: "リアクションを選択"
|
choose-reaction: "リアクションを選択"
|
||||||
|
common/views/components/emoji-picker.vue:
|
||||||
|
custom-emoji: "カスタム絵文字"
|
||||||
|
people: "人"
|
||||||
|
animals-and-nature: "動物&自然"
|
||||||
|
food-and-drink: "食べ物&飲み物"
|
||||||
|
activity: "アクティビティ"
|
||||||
|
travel-and-places: "場所"
|
||||||
|
objects: "物"
|
||||||
|
symbols: "記号"
|
||||||
|
flags: "旗"
|
||||||
common/views/components/signin.vue:
|
common/views/components/signin.vue:
|
||||||
username: "ユーザー名"
|
username: "ユーザー名"
|
||||||
password: "パスワード"
|
password: "パスワード"
|
||||||
@@ -588,12 +598,6 @@ desktop/views/components/media-image.vue:
|
|||||||
desktop/views/components/media-video.vue:
|
desktop/views/components/media-video.vue:
|
||||||
sensitive: "閲覧注意"
|
sensitive: "閲覧注意"
|
||||||
click-to-show: "クリックして表示"
|
click-to-show: "クリックして表示"
|
||||||
desktop/views/components/follow-button.vue:
|
|
||||||
following: "フォロー中"
|
|
||||||
follow: "フォロー"
|
|
||||||
request-pending: "フォロー許可待ち"
|
|
||||||
follow-processing: "フォロー処理中"
|
|
||||||
follow-request: "フォロー申請"
|
|
||||||
desktop/views/components/followers-window.vue:
|
desktop/views/components/followers-window.vue:
|
||||||
followers: "{} のフォロワー"
|
followers: "{} のフォロワー"
|
||||||
desktop/views/components/followers.vue:
|
desktop/views/components/followers.vue:
|
||||||
@@ -829,6 +833,10 @@ common/views/components/mute-and-block.vue:
|
|||||||
block: "ブロック"
|
block: "ブロック"
|
||||||
no-muted-users: "ミュートしているユーザーはいません"
|
no-muted-users: "ミュートしているユーザーはいません"
|
||||||
no-blocked-users: "ブロックしているユーザーはいません"
|
no-blocked-users: "ブロックしているユーザーはいません"
|
||||||
|
word-mute: "ワードミュート"
|
||||||
|
muted-words: "ミュートされたキーワード"
|
||||||
|
muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
|
||||||
|
save: "保存"
|
||||||
common/views/components/password-settings.vue:
|
common/views/components/password-settings.vue:
|
||||||
reset: "パスワードを変更する"
|
reset: "パスワードを変更する"
|
||||||
enter-current-password: "現在のパスワードを入力してください"
|
enter-current-password: "現在のパスワードを入力してください"
|
||||||
@@ -1161,7 +1169,7 @@ mobile/views/components/media-image.vue:
|
|||||||
mobile/views/components/media-video.vue:
|
mobile/views/components/media-video.vue:
|
||||||
sensitive: "閲覧注意"
|
sensitive: "閲覧注意"
|
||||||
click-to-show: "クリックして表示"
|
click-to-show: "クリックして表示"
|
||||||
mobile/views/components/follow-button.vue:
|
common/views/components/follow-button.vue:
|
||||||
following: "フォロー中"
|
following: "フォロー中"
|
||||||
follow: "フォロー"
|
follow: "フォロー"
|
||||||
request-pending: "フォロー許可待ち"
|
request-pending: "フォロー許可待ち"
|
||||||
|
@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
|
|||||||
destroy: "アンケートを破棄"
|
destroy: "アンケートを破棄"
|
||||||
common/views/components/reaction-picker.vue:
|
common/views/components/reaction-picker.vue:
|
||||||
choose-reaction: "リアクションを選択"
|
choose-reaction: "リアクションを選択"
|
||||||
|
common/views/components/emoji-picker.vue:
|
||||||
|
custom-emoji: "カスタム絵文字"
|
||||||
|
people: "人"
|
||||||
|
animals-and-nature: "動物&自然"
|
||||||
|
food-and-drink: "食べ物&飲み物"
|
||||||
|
activity: "アクティビティ"
|
||||||
|
travel-and-places: "場所"
|
||||||
|
objects: "物"
|
||||||
|
symbols: "記号"
|
||||||
|
flags: "旗"
|
||||||
common/views/components/signin.vue:
|
common/views/components/signin.vue:
|
||||||
username: "ユーザー名"
|
username: "ユーザー名"
|
||||||
password: "パスワード"
|
password: "パスワード"
|
||||||
@@ -588,12 +598,6 @@ desktop/views/components/media-image.vue:
|
|||||||
desktop/views/components/media-video.vue:
|
desktop/views/components/media-video.vue:
|
||||||
sensitive: "閲覧注意"
|
sensitive: "閲覧注意"
|
||||||
click-to-show: "クリックして表示"
|
click-to-show: "クリックして表示"
|
||||||
desktop/views/components/follow-button.vue:
|
|
||||||
following: "フォロー中"
|
|
||||||
follow: "フォロー"
|
|
||||||
request-pending: "フォロー許可待ち"
|
|
||||||
follow-processing: "フォロー処理中"
|
|
||||||
follow-request: "フォロー申請"
|
|
||||||
desktop/views/components/followers-window.vue:
|
desktop/views/components/followers-window.vue:
|
||||||
followers: "{} のフォロワー"
|
followers: "{} のフォロワー"
|
||||||
desktop/views/components/followers.vue:
|
desktop/views/components/followers.vue:
|
||||||
@@ -829,6 +833,10 @@ common/views/components/mute-and-block.vue:
|
|||||||
block: "ブロック"
|
block: "ブロック"
|
||||||
no-muted-users: "ミュートしているユーザーはいません"
|
no-muted-users: "ミュートしているユーザーはいません"
|
||||||
no-blocked-users: "ブロックしているユーザーはいません"
|
no-blocked-users: "ブロックしているユーザーはいません"
|
||||||
|
word-mute: "ワードミュート"
|
||||||
|
muted-words: "ミュートされたキーワード"
|
||||||
|
muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
|
||||||
|
save: "保存"
|
||||||
common/views/components/password-settings.vue:
|
common/views/components/password-settings.vue:
|
||||||
reset: "パスワードを変更する"
|
reset: "パスワードを変更する"
|
||||||
enter-current-password: "現在のパスワードを入力してください"
|
enter-current-password: "現在のパスワードを入力してください"
|
||||||
@@ -1161,7 +1169,7 @@ mobile/views/components/media-image.vue:
|
|||||||
mobile/views/components/media-video.vue:
|
mobile/views/components/media-video.vue:
|
||||||
sensitive: "閲覧注意"
|
sensitive: "閲覧注意"
|
||||||
click-to-show: "クリックして表示"
|
click-to-show: "クリックして表示"
|
||||||
mobile/views/components/follow-button.vue:
|
common/views/components/follow-button.vue:
|
||||||
following: "フォロー中"
|
following: "フォロー中"
|
||||||
follow: "フォロー"
|
follow: "フォロー"
|
||||||
request-pending: "フォロー許可待ち"
|
request-pending: "フォロー許可待ち"
|
||||||
|
@@ -344,6 +344,16 @@ common/views/components/poll-editor.vue:
|
|||||||
destroy: "アンケートを破棄"
|
destroy: "アンケートを破棄"
|
||||||
common/views/components/reaction-picker.vue:
|
common/views/components/reaction-picker.vue:
|
||||||
choose-reaction: "リアクションを選択"
|
choose-reaction: "リアクションを選択"
|
||||||
|
common/views/components/emoji-picker.vue:
|
||||||
|
custom-emoji: "カスタム絵文字"
|
||||||
|
people: "人"
|
||||||
|
animals-and-nature: "動物&自然"
|
||||||
|
food-and-drink: "食べ物&飲み物"
|
||||||
|
activity: "アクティビティ"
|
||||||
|
travel-and-places: "場所"
|
||||||
|
objects: "物"
|
||||||
|
symbols: "記号"
|
||||||
|
flags: "旗"
|
||||||
common/views/components/signin.vue:
|
common/views/components/signin.vue:
|
||||||
username: "ユーザー名"
|
username: "ユーザー名"
|
||||||
password: "パスワード"
|
password: "パスワード"
|
||||||
@@ -588,12 +598,6 @@ desktop/views/components/media-image.vue:
|
|||||||
desktop/views/components/media-video.vue:
|
desktop/views/components/media-video.vue:
|
||||||
sensitive: "閲覧注意"
|
sensitive: "閲覧注意"
|
||||||
click-to-show: "クリックして表示"
|
click-to-show: "クリックして表示"
|
||||||
desktop/views/components/follow-button.vue:
|
|
||||||
following: "フォロー中"
|
|
||||||
follow: "フォロー"
|
|
||||||
request-pending: "フォロー許可待ち"
|
|
||||||
follow-processing: "フォロー処理中"
|
|
||||||
follow-request: "フォロー申請"
|
|
||||||
desktop/views/components/followers-window.vue:
|
desktop/views/components/followers-window.vue:
|
||||||
followers: "{} のフォロワー"
|
followers: "{} のフォロワー"
|
||||||
desktop/views/components/followers.vue:
|
desktop/views/components/followers.vue:
|
||||||
@@ -829,6 +833,10 @@ common/views/components/mute-and-block.vue:
|
|||||||
block: "ブロック"
|
block: "ブロック"
|
||||||
no-muted-users: "ミュートしているユーザーはいません"
|
no-muted-users: "ミュートしているユーザーはいません"
|
||||||
no-blocked-users: "ブロックしているユーザーはいません"
|
no-blocked-users: "ブロックしているユーザーはいません"
|
||||||
|
word-mute: "ワードミュート"
|
||||||
|
muted-words: "ミュートされたキーワード"
|
||||||
|
muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
|
||||||
|
save: "保存"
|
||||||
common/views/components/password-settings.vue:
|
common/views/components/password-settings.vue:
|
||||||
reset: "パスワードを変更する"
|
reset: "パスワードを変更する"
|
||||||
enter-current-password: "現在のパスワードを入力してください"
|
enter-current-password: "現在のパスワードを入力してください"
|
||||||
@@ -1161,7 +1169,7 @@ mobile/views/components/media-image.vue:
|
|||||||
mobile/views/components/media-video.vue:
|
mobile/views/components/media-video.vue:
|
||||||
sensitive: "閲覧注意"
|
sensitive: "閲覧注意"
|
||||||
click-to-show: "クリックして表示"
|
click-to-show: "クリックして表示"
|
||||||
mobile/views/components/follow-button.vue:
|
common/views/components/follow-button.vue:
|
||||||
following: "フォロー中"
|
following: "フォロー中"
|
||||||
follow: "フォロー"
|
follow: "フォロー"
|
||||||
request-pending: "フォロー許可待ち"
|
request-pending: "フォロー許可待ち"
|
||||||
|
@@ -1,8 +1,8 @@
|
|||||||
{
|
{
|
||||||
"name": "misskey",
|
"name": "misskey",
|
||||||
"author": "syuilo <i@syuilo.com>",
|
"author": "syuilo <i@syuilo.com>",
|
||||||
"version": "10.49.2",
|
"version": "10.49.6",
|
||||||
"clientVersion": "2.0.11761",
|
"clientVersion": "2.0.11783",
|
||||||
"codename": "nighthike",
|
"codename": "nighthike",
|
||||||
"main": "./built/index.js",
|
"main": "./built/index.js",
|
||||||
"private": true,
|
"private": true,
|
||||||
@@ -221,7 +221,6 @@
|
|||||||
"vue-router": "3.0.1",
|
"vue-router": "3.0.1",
|
||||||
"vue-style-loader": "4.1.2",
|
"vue-style-loader": "4.1.2",
|
||||||
"vue-svg-inline-loader": "1.2.1",
|
"vue-svg-inline-loader": "1.2.1",
|
||||||
"vue-sweetalert2": "1.5.7",
|
|
||||||
"vue-template-compiler": "2.5.17",
|
"vue-template-compiler": "2.5.17",
|
||||||
"vuedraggable": "2.16.0",
|
"vuedraggable": "2.16.0",
|
||||||
"vuewordcloud": "18.7.11",
|
"vuewordcloud": "18.7.11",
|
||||||
|
@@ -48,15 +48,15 @@ export default Vue.extend({
|
|||||||
},
|
},
|
||||||
|
|
||||||
remove(i) {
|
remove(i) {
|
||||||
this.$swal({
|
this.$root.alert({
|
||||||
type: 'warning',
|
type: 'warning',
|
||||||
text: this.$t('_remove.are-you-sure').replace('$1', this.announcements.find((_, j) => j == i).title),
|
text: this.$t('_remove.are-you-sure').replace('$1', this.announcements.find((_, j) => j == i).title),
|
||||||
showCancelButton: true
|
showCancelButton: true
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
if (!res.value) return;
|
if (!res) return;
|
||||||
this.announcements = this.announcements.filter((_, j) => j !== i);
|
this.announcements = this.announcements.filter((_, j) => j !== i);
|
||||||
this.save(true);
|
this.save(true);
|
||||||
this.$swal({
|
this.$root.alert({
|
||||||
type: 'success',
|
type: 'success',
|
||||||
text: this.$t('_remove.removed')
|
text: this.$t('_remove.removed')
|
||||||
});
|
});
|
||||||
@@ -68,13 +68,13 @@ export default Vue.extend({
|
|||||||
broadcasts: this.announcements
|
broadcasts: this.announcements
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
if (!silent) {
|
if (!silent) {
|
||||||
this.$swal({
|
this.$root.alert({
|
||||||
type: 'success',
|
type: 'success',
|
||||||
text: this.$t('saved')
|
text: this.$t('saved')
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
this.$swal({
|
this.$root.alert({
|
||||||
type: 'error',
|
type: 'error',
|
||||||
text: e
|
text: e
|
||||||
});
|
});
|
||||||
|
@@ -3,17 +3,17 @@
|
|||||||
<table>
|
<table>
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th><fa icon="exchange-alt"/> In/Out</th>
|
<th><fa :icon="faExchangeAlt"/> In/Out</th>
|
||||||
|
<th><fa :icon="faBolt"/> Activity</th>
|
||||||
<th><fa icon="server"/> Host</th>
|
<th><fa icon="server"/> Host</th>
|
||||||
<th><fa icon="bolt"/> Activity</th>
|
|
||||||
<th><fa icon="user"/> Actor</th>
|
<th><fa icon="user"/> Actor</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr v-for="log in logs" :key="log.id">
|
<tr v-for="log in logs" :key="log.id">
|
||||||
<td :class="log.direction">{{ log.direction == 'in' ? '<' : '>' }} {{ log.direction }}</td>
|
<td :class="log.direction">{{ log.direction == 'in' ? '<' : '>' }} {{ log.direction }}</td>
|
||||||
<td>{{ log.host }}</td>
|
|
||||||
<td>{{ log.activity }}</td>
|
<td>{{ log.activity }}</td>
|
||||||
|
<td>{{ log.host }}</td>
|
||||||
<td>@{{ log.actor }}</td>
|
<td>@{{ log.actor }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
@@ -23,12 +23,14 @@
|
|||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import Vue from 'vue';
|
import Vue from 'vue';
|
||||||
|
import { faBolt, faExchangeAlt } from '@fortawesome/free-solid-svg-icons';
|
||||||
|
|
||||||
export default Vue.extend({
|
export default Vue.extend({
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
logs: [],
|
logs: [],
|
||||||
connection: null
|
connection: null,
|
||||||
|
faBolt, faExchangeAlt
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@@ -37,7 +37,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<div>
|
<div>
|
||||||
<div><fa icon="database"/></div>
|
<div><fa :icon="faDatabase"/></div>
|
||||||
<div>
|
<div>
|
||||||
<span>{{ $t('drive') }}</span>
|
<span>{{ $t('drive') }}</span>
|
||||||
<b>{{ stats.driveUsageLocal | bytes }}</b>
|
<b>{{ stats.driveUsageLocal | bytes }}</b>
|
||||||
@@ -83,9 +83,11 @@ import i18n from '../../i18n';
|
|||||||
import XCpuMemory from "./cpu-memory.vue";
|
import XCpuMemory from "./cpu-memory.vue";
|
||||||
import XCharts from "./charts.vue";
|
import XCharts from "./charts.vue";
|
||||||
import XApLog from "./ap-log.vue";
|
import XApLog from "./ap-log.vue";
|
||||||
|
import { faDatabase } from '@fortawesome/free-solid-svg-icons';
|
||||||
|
|
||||||
export default Vue.extend({
|
export default Vue.extend({
|
||||||
i18n: i18n('admin/views/dashboard.vue'),
|
i18n: i18n('admin/views/dashboard.vue'),
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
XCpuMemory,
|
XCpuMemory,
|
||||||
XCharts,
|
XCharts,
|
||||||
@@ -96,7 +98,8 @@ export default Vue.extend({
|
|||||||
return {
|
return {
|
||||||
stats: null,
|
stats: null,
|
||||||
connection: null,
|
connection: null,
|
||||||
meta: null
|
meta: null,
|
||||||
|
faDatabase
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@@ -23,7 +23,7 @@
|
|||||||
</ui-card>
|
</ui-card>
|
||||||
|
|
||||||
<ui-card>
|
<ui-card>
|
||||||
<div slot="title"><fa :icon="['far', 'grin']"/> {{ $t('emojis.title') }}</div>
|
<div slot="title"><fa :icon="faGrin"/> {{ $t('emojis.title') }}</div>
|
||||||
<section v-for="emoji in emojis">
|
<section v-for="emoji in emojis">
|
||||||
<img :src="emoji.url" :alt="emoji.name" style="width: 64px;"/>
|
<img :src="emoji.url" :alt="emoji.name" style="width: 64px;"/>
|
||||||
<ui-horizon-group inputs>
|
<ui-horizon-group inputs>
|
||||||
@@ -50,6 +50,7 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import Vue from 'vue';
|
import Vue from 'vue';
|
||||||
import i18n from '../../i18n';
|
import i18n from '../../i18n';
|
||||||
|
import { faGrin } from '@fortawesome/free-regular-svg-icons';
|
||||||
|
|
||||||
export default Vue.extend({
|
export default Vue.extend({
|
||||||
i18n: i18n('admin/views/emoji.vue'),
|
i18n: i18n('admin/views/emoji.vue'),
|
||||||
@@ -58,7 +59,8 @@ export default Vue.extend({
|
|||||||
name: '',
|
name: '',
|
||||||
url: '',
|
url: '',
|
||||||
aliases: '',
|
aliases: '',
|
||||||
emojis: []
|
emojis: [],
|
||||||
|
faGrin
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -73,13 +75,13 @@ export default Vue.extend({
|
|||||||
url: this.url,
|
url: this.url,
|
||||||
aliases: this.aliases.split(' ').filter(x => x.length > 0)
|
aliases: this.aliases.split(' ').filter(x => x.length > 0)
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.$swal({
|
this.$root.alert({
|
||||||
type: 'success',
|
type: 'success',
|
||||||
text: this.$t('add-emoji.added')
|
text: this.$t('add-emoji.added')
|
||||||
});
|
});
|
||||||
this.fetchEmojis();
|
this.fetchEmojis();
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
this.$swal({
|
this.$root.alert({
|
||||||
type: 'error',
|
type: 'error',
|
||||||
text: e
|
text: e
|
||||||
});
|
});
|
||||||
@@ -101,12 +103,12 @@ export default Vue.extend({
|
|||||||
url: emoji.url,
|
url: emoji.url,
|
||||||
aliases: emoji.aliases.split(' ').filter(x => x.length > 0)
|
aliases: emoji.aliases.split(' ').filter(x => x.length > 0)
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.$swal({
|
this.$root.alert({
|
||||||
type: 'success',
|
type: 'success',
|
||||||
text: this.$t('updated')
|
text: this.$t('updated')
|
||||||
});
|
});
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
this.$swal({
|
this.$root.alert({
|
||||||
type: 'error',
|
type: 'error',
|
||||||
text: e
|
text: e
|
||||||
});
|
});
|
||||||
@@ -114,23 +116,23 @@ export default Vue.extend({
|
|||||||
},
|
},
|
||||||
|
|
||||||
removeEmoji(emoji) {
|
removeEmoji(emoji) {
|
||||||
this.$swal({
|
this.$root.alert({
|
||||||
type: 'warning',
|
type: 'warning',
|
||||||
text: this.$t('remove-emoji.are-you-sure').replace('$1', emoji.name),
|
text: this.$t('remove-emoji.are-you-sure').replace('$1', emoji.name),
|
||||||
showCancelButton: true
|
showCancelButton: true
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
if (!res.value) return;
|
if (!res) return;
|
||||||
|
|
||||||
this.$root.api('admin/emoji/remove', {
|
this.$root.api('admin/emoji/remove', {
|
||||||
id: emoji.id
|
id: emoji.id
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.$swal({
|
this.$root.alert({
|
||||||
type: 'success',
|
type: 'success',
|
||||||
text: this.$t('remove-emoji.removed')
|
text: this.$t('remove-emoji.removed')
|
||||||
});
|
});
|
||||||
this.fetchEmojis();
|
this.fetchEmojis();
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
this.$swal({
|
this.$root.alert({
|
||||||
type: 'error',
|
type: 'error',
|
||||||
text: e
|
text: e
|
||||||
});
|
});
|
||||||
|
@@ -21,7 +21,7 @@
|
|||||||
<li @click="nav('dashboard')" :class="{ active: page == 'dashboard' }"><fa icon="home" fixed-width/>{{ $t('dashboard') }}</li>
|
<li @click="nav('dashboard')" :class="{ active: page == 'dashboard' }"><fa icon="home" fixed-width/>{{ $t('dashboard') }}</li>
|
||||||
<li @click="nav('instance')" :class="{ active: page == 'instance' }"><fa icon="cog" fixed-width/>{{ $t('instance') }}</li>
|
<li @click="nav('instance')" :class="{ active: page == 'instance' }"><fa icon="cog" fixed-width/>{{ $t('instance') }}</li>
|
||||||
<li @click="nav('users')" :class="{ active: page == 'users' }"><fa icon="users" fixed-width/>{{ $t('users') }}</li>
|
<li @click="nav('users')" :class="{ active: page == 'users' }"><fa icon="users" fixed-width/>{{ $t('users') }}</li>
|
||||||
<li @click="nav('emoji')" :class="{ active: page == 'emoji' }"><fa :icon="['far', 'grin']" fixed-width/>{{ $t('emoji') }}</li>
|
<li @click="nav('emoji')" :class="{ active: page == 'emoji' }"><fa :icon="faGrin" fixed-width/>{{ $t('emoji') }}</li>
|
||||||
<li @click="nav('announcements')" :class="{ active: page == 'announcements' }"><fa icon="broadcast-tower" fixed-width/>{{ $t('announcements') }}</li>
|
<li @click="nav('announcements')" :class="{ active: page == 'announcements' }"><fa icon="broadcast-tower" fixed-width/>{{ $t('announcements') }}</li>
|
||||||
<li @click="nav('hashtags')" :class="{ active: page == 'hashtags' }"><fa icon="hashtag" fixed-width/>{{ $t('hashtags') }}</li>
|
<li @click="nav('hashtags')" :class="{ active: page == 'hashtags' }"><fa icon="hashtag" fixed-width/>{{ $t('hashtags') }}</li>
|
||||||
|
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
<!-- <li @click="nav('update')" :class="{ active: page == 'update' }">{{ $t('update') }}</li> -->
|
<!-- <li @click="nav('update')" :class="{ active: page == 'update' }">{{ $t('update') }}</li> -->
|
||||||
</ul>
|
</ul>
|
||||||
<div class="back-to-misskey">
|
<div class="back-to-misskey">
|
||||||
<a href="/"><fa icon="arrow-left"/> {{ $t('back-to-misskey') }}</a>
|
<a href="/"><fa :icon="faArrowLeft"/> {{ $t('back-to-misskey') }}</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="version">
|
<div class="version">
|
||||||
<small>Misskey {{ version }}</small>
|
<small>Misskey {{ version }}</small>
|
||||||
@@ -58,6 +58,8 @@ import XEmoji from "./emoji.vue";
|
|||||||
import XAnnouncements from "./announcements.vue";
|
import XAnnouncements from "./announcements.vue";
|
||||||
import XHashtags from "./hashtags.vue";
|
import XHashtags from "./hashtags.vue";
|
||||||
import XUsers from "./users.vue";
|
import XUsers from "./users.vue";
|
||||||
|
import { faArrowLeft } from '@fortawesome/free-solid-svg-icons';
|
||||||
|
import { faGrin } from '@fortawesome/free-regular-svg-icons';
|
||||||
|
|
||||||
// Detect the user agent
|
// Detect the user agent
|
||||||
const ua = navigator.userAgent.toLowerCase();
|
const ua = navigator.userAgent.toLowerCase();
|
||||||
@@ -81,7 +83,9 @@ export default Vue.extend({
|
|||||||
page: 'dashboard',
|
page: 'dashboard',
|
||||||
version,
|
version,
|
||||||
isMobile,
|
isMobile,
|
||||||
navOpend: !isMobile
|
navOpend: !isMobile,
|
||||||
|
faGrin,
|
||||||
|
faArrowLeft
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
@@ -10,7 +10,7 @@
|
|||||||
<ui-input v-model="languages"><i slot="icon"><fa icon="language"/></i>{{ $t('languages') }}<span slot="desc">{{ $t('languages-desc') }}</span></ui-input>
|
<ui-input v-model="languages"><i slot="icon"><fa icon="language"/></i>{{ $t('languages') }}<span slot="desc">{{ $t('languages-desc') }}</span></ui-input>
|
||||||
</section>
|
</section>
|
||||||
<section class="fit-bottom">
|
<section class="fit-bottom">
|
||||||
<header><fa icon="headset"/> {{ $t('maintainer-config') }}</header>
|
<header><fa :icon="faHeadset"/> {{ $t('maintainer-config') }}</header>
|
||||||
<ui-input v-model="maintainerName">{{ $t('maintainer-name') }}</ui-input>
|
<ui-input v-model="maintainerName">{{ $t('maintainer-name') }}</ui-input>
|
||||||
<ui-input v-model="maintainerEmail" type="email"><i slot="icon"><fa :icon="['far', 'envelope']"/></i>{{ $t('maintainer-email') }}</ui-input>
|
<ui-input v-model="maintainerEmail" type="email"><i slot="icon"><fa :icon="['far', 'envelope']"/></i>{{ $t('maintainer-email') }}</ui-input>
|
||||||
</section>
|
</section>
|
||||||
@@ -24,14 +24,14 @@
|
|||||||
<ui-input v-model="remoteDriveCapacityMb" type="number" :disabled="!cacheRemoteFiles">{{ $t('remote-drive-capacity-mb') }}<span slot="suffix">MB</span><span slot="desc">{{ $t('mb') }}</span></ui-input>
|
<ui-input v-model="remoteDriveCapacityMb" type="number" :disabled="!cacheRemoteFiles">{{ $t('remote-drive-capacity-mb') }}<span slot="suffix">MB</span><span slot="desc">{{ $t('mb') }}</span></ui-input>
|
||||||
</section>
|
</section>
|
||||||
<section class="fit-bottom">
|
<section class="fit-bottom">
|
||||||
<header><fa icon="shield-alt"/> {{ $t('recaptcha-config') }}</header>
|
<header><fa :icon="faShieldAlt"/> {{ $t('recaptcha-config') }}</header>
|
||||||
<ui-switch v-model="enableRecaptcha">{{ $t('enable-recaptcha') }}</ui-switch>
|
<ui-switch v-model="enableRecaptcha">{{ $t('enable-recaptcha') }}</ui-switch>
|
||||||
<ui-info>{{ $t('recaptcha-info') }}</ui-info>
|
<ui-info>{{ $t('recaptcha-info') }}</ui-info>
|
||||||
<ui-input v-model="recaptchaSiteKey" :disabled="!enableRecaptcha"><i slot="icon"><fa icon="key"/></i>{{ $t('recaptcha-site-key') }}</ui-input>
|
<ui-input v-model="recaptchaSiteKey" :disabled="!enableRecaptcha"><i slot="icon"><fa icon="key"/></i>{{ $t('recaptcha-site-key') }}</ui-input>
|
||||||
<ui-input v-model="recaptchaSecretKey" :disabled="!enableRecaptcha"><i slot="icon"><fa icon="key"/></i>{{ $t('recaptcha-secret-key') }}</ui-input>
|
<ui-input v-model="recaptchaSecretKey" :disabled="!enableRecaptcha"><i slot="icon"><fa icon="key"/></i>{{ $t('recaptcha-secret-key') }}</ui-input>
|
||||||
</section>
|
</section>
|
||||||
<section>
|
<section>
|
||||||
<header><fa icon="ghost"/> {{ $t('proxy-account-config') }}</header>
|
<header><fa :icon="faGhost"/> {{ $t('proxy-account-config') }}</header>
|
||||||
<ui-info>{{ $t('proxy-account-info') }}</ui-info>
|
<ui-info>{{ $t('proxy-account-info') }}</ui-info>
|
||||||
<ui-input v-model="proxyAccount"><span slot="prefix">@</span>{{ $t('proxy-account-username') }}<span slot="desc">{{ $t('proxy-account-username-desc') }}</span></ui-input>
|
<ui-input v-model="proxyAccount"><span slot="prefix">@</span>{{ $t('proxy-account-username') }}<span slot="desc">{{ $t('proxy-account-username-desc') }}</span></ui-input>
|
||||||
<ui-info warn>{{ $t('proxy-account-warn') }}</ui-info>
|
<ui-info warn>{{ $t('proxy-account-warn') }}</ui-info>
|
||||||
@@ -84,9 +84,11 @@ import Vue from 'vue';
|
|||||||
import i18n from '../../i18n';
|
import i18n from '../../i18n';
|
||||||
import { host } from '../../config';
|
import { host } from '../../config';
|
||||||
import { toUnicode } from 'punycode';
|
import { toUnicode } from 'punycode';
|
||||||
|
import { faHeadset, faShieldAlt, faGhost } from '@fortawesome/free-solid-svg-icons';
|
||||||
|
|
||||||
export default Vue.extend({
|
export default Vue.extend({
|
||||||
i18n: i18n('admin/views/instance.vue'),
|
i18n: i18n('admin/views/instance.vue'),
|
||||||
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
host: toUnicode(host),
|
host: toUnicode(host),
|
||||||
@@ -113,6 +115,7 @@ export default Vue.extend({
|
|||||||
githubClientSecret: null,
|
githubClientSecret: null,
|
||||||
proxyAccount: null,
|
proxyAccount: null,
|
||||||
inviteCode: null,
|
inviteCode: null,
|
||||||
|
faHeadset, faShieldAlt, faGhost
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -146,7 +149,7 @@ export default Vue.extend({
|
|||||||
this.$root.api('admin/invite').then(x => {
|
this.$root.api('admin/invite').then(x => {
|
||||||
this.inviteCode = x.code;
|
this.inviteCode = x.code;
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
this.$swal({
|
this.$root.alert({
|
||||||
type: 'error',
|
type: 'error',
|
||||||
text: e
|
text: e
|
||||||
});
|
});
|
||||||
@@ -178,12 +181,12 @@ export default Vue.extend({
|
|||||||
githubClientId: this.githubClientId,
|
githubClientId: this.githubClientId,
|
||||||
githubClientSecret: this.githubClientSecret,
|
githubClientSecret: this.githubClientSecret,
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.$swal({
|
this.$root.alert({
|
||||||
type: 'success',
|
type: 'success',
|
||||||
text: this.$t('saved')
|
text: this.$t('saved')
|
||||||
});
|
});
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
this.$swal({
|
this.$root.alert({
|
||||||
type: 'error',
|
type: 'error',
|
||||||
text: e
|
text: e
|
||||||
});
|
});
|
||||||
|
@@ -123,29 +123,3 @@ pre
|
|||||||
|
|
||||||
[data-icon]
|
[data-icon]
|
||||||
display inline-block
|
display inline-block
|
||||||
|
|
||||||
.swal2-container
|
|
||||||
z-index 10000 !important
|
|
||||||
|
|
||||||
&.swal2-shown
|
|
||||||
background-color rgba(0, 0, 0, 0.5) !important
|
|
||||||
|
|
||||||
.swal2-popup
|
|
||||||
background var(--face) !important
|
|
||||||
|
|
||||||
.swal2-content
|
|
||||||
color var(--text) !important
|
|
||||||
|
|
||||||
.swal2-confirm
|
|
||||||
background-color var(--primary) !important
|
|
||||||
border-left-color var(--primary) !important
|
|
||||||
border-right-color var(--primary) !important
|
|
||||||
color var(--primaryForeground) !important
|
|
||||||
|
|
||||||
&:hover
|
|
||||||
background-image none !important
|
|
||||||
background-color var(--primaryDarken5) !important
|
|
||||||
|
|
||||||
&:active
|
|
||||||
background-image none !important
|
|
||||||
background-color var(--primaryDarken5) !important
|
|
||||||
|
@@ -22,7 +22,7 @@ export default async function($root: any, force = false, silent = false) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!silent) {
|
if (!silent) {
|
||||||
$root.$dialog({
|
$root.alert({
|
||||||
title: $root.$t('@.update-available-title'),
|
title: $root.$t('@.update-available-title'),
|
||||||
text: $root.$t('@.update-available', { newer, current })
|
text: $root.$t('@.update-available', { newer, current })
|
||||||
});
|
});
|
||||||
|
@@ -4,12 +4,9 @@ export default ($root: any) => {
|
|||||||
require('fuckadblock');
|
require('fuckadblock');
|
||||||
|
|
||||||
function adBlockDetected() {
|
function adBlockDetected() {
|
||||||
$root.$dialog({
|
$root.alert({
|
||||||
title: $root.$t('@.adblock.detected'),
|
title: $root.$t('@.adblock.detected'),
|
||||||
text: $root.$t('@.adblock.warning'),
|
text: $root.$t('@.adblock.warning')
|
||||||
actins: [{
|
|
||||||
text: 'OK'
|
|
||||||
}]
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -3,7 +3,6 @@ import { sum } from '../../../../prelude/array';
|
|||||||
import shouldMuteNote from './should-mute-note';
|
import shouldMuteNote from './should-mute-note';
|
||||||
import MkNoteMenu from '../views/components/note-menu.vue';
|
import MkNoteMenu from '../views/components/note-menu.vue';
|
||||||
import MkReactionPicker from '../views/components/reaction-picker.vue';
|
import MkReactionPicker from '../views/components/reaction-picker.vue';
|
||||||
import Ok from '../views/components/ok.vue';
|
|
||||||
|
|
||||||
function focus(el, fn) {
|
function focus(el, fn) {
|
||||||
const target = fn(el);
|
const target = fn(el);
|
||||||
@@ -142,7 +141,11 @@ export default (opts: Opts = {}) => ({
|
|||||||
this.$root.api('notes/favorites/create', {
|
this.$root.api('notes/favorites/create', {
|
||||||
noteId: this.appearNote.id
|
noteId: this.appearNote.id
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.$root.new(Ok);
|
// TODO
|
||||||
|
/*this.$root.alert({
|
||||||
|
pointer: false,
|
||||||
|
autoClose: true
|
||||||
|
});*/
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
186
src/client/app/common/views/components/alert.vue
Normal file
186
src/client/app/common/views/components/alert.vue
Normal file
@@ -0,0 +1,186 @@
|
|||||||
|
<template>
|
||||||
|
<div class="felqjxyj" :class="{ pointer }">
|
||||||
|
<div class="bg" ref="bg" @click="onBgClick"></div>
|
||||||
|
<div class="main" ref="main">
|
||||||
|
<div class="icon" :class="type"><fa :icon="icon"/></div>
|
||||||
|
<header v-if="title" v-html="title"></header>
|
||||||
|
<div class="body" v-if="text" v-html="text"></div>
|
||||||
|
<ui-horizon-group no-grow class="buttons">
|
||||||
|
<ui-button @click="ok" primary autofocus>OK</ui-button>
|
||||||
|
<ui-button @click="cancel" v-if="showCancelButton">Cancel</ui-button>
|
||||||
|
</ui-horizon-group>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script lang="ts">
|
||||||
|
import Vue from 'vue';
|
||||||
|
import * as anime from 'animejs';
|
||||||
|
import { faTimesCircle, faQuestionCircle } from '@fortawesome/free-regular-svg-icons';
|
||||||
|
|
||||||
|
export default Vue.extend({
|
||||||
|
props: {
|
||||||
|
type: {
|
||||||
|
type: String,
|
||||||
|
required: false,
|
||||||
|
default: 'info'
|
||||||
|
},
|
||||||
|
title: {
|
||||||
|
type: String,
|
||||||
|
required: false
|
||||||
|
},
|
||||||
|
text: {
|
||||||
|
type: String,
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
showCancelButton: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false
|
||||||
|
},
|
||||||
|
pointer: {
|
||||||
|
type: Boolean,
|
||||||
|
default: true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
computed: {
|
||||||
|
icon(): any {
|
||||||
|
switch (this.type) {
|
||||||
|
case 'success': return 'check';
|
||||||
|
case 'error': return faTimesCircle;
|
||||||
|
case 'warning': return 'exclamation-triangle';
|
||||||
|
case 'info': return 'info-circle';
|
||||||
|
case 'question': return faQuestionCircle;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
mounted() {
|
||||||
|
this.$nextTick(() => {
|
||||||
|
(this.$refs.bg as any).style.pointerEvents = 'auto';
|
||||||
|
anime({
|
||||||
|
targets: this.$refs.bg,
|
||||||
|
opacity: 1,
|
||||||
|
duration: 100,
|
||||||
|
easing: 'linear'
|
||||||
|
});
|
||||||
|
|
||||||
|
anime({
|
||||||
|
targets: this.$refs.main,
|
||||||
|
opacity: 1,
|
||||||
|
scale: [1.2, 1],
|
||||||
|
duration: 300,
|
||||||
|
easing: [0, 0.5, 0.5, 1]
|
||||||
|
});
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
methods: {
|
||||||
|
ok() {
|
||||||
|
this.$emit('ok');
|
||||||
|
this.close();
|
||||||
|
},
|
||||||
|
|
||||||
|
cancel() {
|
||||||
|
this.$emit('cancel');
|
||||||
|
this.close();
|
||||||
|
},
|
||||||
|
|
||||||
|
close() {
|
||||||
|
(this.$refs.bg as any).style.pointerEvents = 'none';
|
||||||
|
anime({
|
||||||
|
targets: this.$refs.bg,
|
||||||
|
opacity: 0,
|
||||||
|
duration: 300,
|
||||||
|
easing: 'linear'
|
||||||
|
});
|
||||||
|
|
||||||
|
(this.$refs.main as any).style.pointerEvents = 'none';
|
||||||
|
anime({
|
||||||
|
targets: this.$refs.main,
|
||||||
|
opacity: 0,
|
||||||
|
scale: 0.8,
|
||||||
|
duration: 300,
|
||||||
|
easing: [0, 0.5, 0.5, 1],
|
||||||
|
complete: () => this.destroyDom()
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
onBgClick() {
|
||||||
|
this.cancel();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="stylus" scoped>
|
||||||
|
.felqjxyj
|
||||||
|
display flex
|
||||||
|
align-items center
|
||||||
|
justify-content center
|
||||||
|
position fixed
|
||||||
|
z-index 30000
|
||||||
|
top 0
|
||||||
|
left 0
|
||||||
|
width 100%
|
||||||
|
height 100%
|
||||||
|
|
||||||
|
&:not(.pointer)
|
||||||
|
pointer-events none
|
||||||
|
|
||||||
|
> .bg
|
||||||
|
display block
|
||||||
|
position fixed
|
||||||
|
top 0
|
||||||
|
left 0
|
||||||
|
width 100%
|
||||||
|
height 100%
|
||||||
|
background rgba(#000, 0.7)
|
||||||
|
opacity 0
|
||||||
|
pointer-events none
|
||||||
|
|
||||||
|
> .main
|
||||||
|
display block
|
||||||
|
position fixed
|
||||||
|
margin auto
|
||||||
|
padding 32px
|
||||||
|
min-width 320px
|
||||||
|
max-width 480px
|
||||||
|
width calc(100% - 32px)
|
||||||
|
text-align center
|
||||||
|
background var(--face)
|
||||||
|
border-radius 8px
|
||||||
|
color var(--faceText)
|
||||||
|
opacity 0
|
||||||
|
|
||||||
|
> .icon
|
||||||
|
font-size 32px
|
||||||
|
|
||||||
|
&.success
|
||||||
|
color #37ec92
|
||||||
|
|
||||||
|
&.error
|
||||||
|
color #ec4137
|
||||||
|
|
||||||
|
&.warning
|
||||||
|
color #ecb637
|
||||||
|
|
||||||
|
> *
|
||||||
|
display block
|
||||||
|
margin 0 auto
|
||||||
|
|
||||||
|
> header
|
||||||
|
margin 16px 0 8px 0
|
||||||
|
font-weight bold
|
||||||
|
font-size 20px
|
||||||
|
|
||||||
|
& + .body
|
||||||
|
margin-top 8px
|
||||||
|
|
||||||
|
> .body
|
||||||
|
margin 16px 0
|
||||||
|
|
||||||
|
> .buttons
|
||||||
|
margin-top 16px
|
||||||
|
|
||||||
|
</style>
|
@@ -9,7 +9,6 @@ import Vue from 'vue';
|
|||||||
import i18n from '../../../i18n';
|
import i18n from '../../../i18n';
|
||||||
import { url } from '../../../config';
|
import { url } from '../../../config';
|
||||||
import copyToClipboard from '../../../common/scripts/copy-to-clipboard';
|
import copyToClipboard from '../../../common/scripts/copy-to-clipboard';
|
||||||
import Ok from './ok.vue';
|
|
||||||
import { concat, intersperse } from '../../../../../prelude/array';
|
import { concat, intersperse } from '../../../../../prelude/array';
|
||||||
|
|
||||||
export default Vue.extend({
|
export default Vue.extend({
|
||||||
@@ -79,7 +78,8 @@ export default Vue.extend({
|
|||||||
this.$root.api('i/pin', {
|
this.$root.api('i/pin', {
|
||||||
noteId: this.note.id
|
noteId: this.note.id
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.$root.new(Ok);
|
// TODO
|
||||||
|
//this.$root.new(Ok);
|
||||||
this.destroyDom();
|
this.destroyDom();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@@ -93,19 +93,27 @@ export default Vue.extend({
|
|||||||
},
|
},
|
||||||
|
|
||||||
del() {
|
del() {
|
||||||
if (!window.confirm(this.$t('delete-confirm'))) return;
|
this.$root.alert({
|
||||||
|
type: 'warning',
|
||||||
|
text: this.$t('delete-confirm'),
|
||||||
|
showCancelButton: true
|
||||||
|
}).then(res => {
|
||||||
|
if (!res) return;
|
||||||
|
|
||||||
this.$root.api('notes/delete', {
|
this.$root.api('notes/delete', {
|
||||||
noteId: this.note.id
|
noteId: this.note.id
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.destroyDom();
|
this.destroyDom();
|
||||||
});
|
});
|
||||||
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
favorite() {
|
favorite() {
|
||||||
this.$root.api('notes/favorites/create', {
|
this.$root.api('notes/favorites/create', {
|
||||||
noteId: this.note.id
|
noteId: this.note.id
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.$root.new(Ok);
|
// TODO
|
||||||
|
//this.$root.new(Ok);
|
||||||
this.destroyDom();
|
this.destroyDom();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@@ -114,7 +122,8 @@ export default Vue.extend({
|
|||||||
this.$root.api('notes/favorites/delete', {
|
this.$root.api('notes/favorites/delete', {
|
||||||
noteId: this.note.id
|
noteId: this.note.id
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.$root.new(Ok);
|
// TODO
|
||||||
|
//this.$root.new(Ok);
|
||||||
this.destroyDom();
|
this.destroyDom();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
@@ -1,175 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="yvbkymdqeusiqucuuloahhiqflzinufs">
|
|
||||||
<div class="bg" ref="bg"></div>
|
|
||||||
<div class="body" ref="body">
|
|
||||||
<div class="icon">
|
|
||||||
<div class="circle left"></div>
|
|
||||||
<span class="check tip"></span>
|
|
||||||
<span class="check long"></span>
|
|
||||||
<div class="ring"></div>
|
|
||||||
<div class="fix"></div>
|
|
||||||
<div class="circle right"></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
import Vue from 'vue';
|
|
||||||
import * as anime from 'animejs';
|
|
||||||
|
|
||||||
export default Vue.extend({
|
|
||||||
mounted() {
|
|
||||||
this.$nextTick(() => {
|
|
||||||
anime({
|
|
||||||
targets: this.$refs.bg,
|
|
||||||
opacity: 1,
|
|
||||||
duration: 300,
|
|
||||||
easing: 'linear'
|
|
||||||
});
|
|
||||||
|
|
||||||
anime({
|
|
||||||
targets: this.$refs.body,
|
|
||||||
opacity: 1,
|
|
||||||
scale: [1.2, 1],
|
|
||||||
duration: 300,
|
|
||||||
easing: [0, 0.5, 0.5, 1]
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
setTimeout(() => {
|
|
||||||
anime({
|
|
||||||
targets: this.$refs.bg,
|
|
||||||
opacity: 0,
|
|
||||||
duration: 300,
|
|
||||||
easing: 'linear'
|
|
||||||
});
|
|
||||||
|
|
||||||
anime({
|
|
||||||
targets: this.$refs.body,
|
|
||||||
opacity: 0,
|
|
||||||
scale: 0.8,
|
|
||||||
duration: 300,
|
|
||||||
easing: [0.5, 0, 1, 0.5],
|
|
||||||
complete: () => this.destroyDom()
|
|
||||||
});
|
|
||||||
}, 1250);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style lang="stylus" scoped>
|
|
||||||
.yvbkymdqeusiqucuuloahhiqflzinufs
|
|
||||||
pointer-events none
|
|
||||||
|
|
||||||
> .bg
|
|
||||||
display block
|
|
||||||
position fixed
|
|
||||||
z-index 10000
|
|
||||||
top 0
|
|
||||||
left 0
|
|
||||||
width 100%
|
|
||||||
height 100%
|
|
||||||
background rgba(#000, 0.7)
|
|
||||||
opacity 0
|
|
||||||
|
|
||||||
> .body
|
|
||||||
position fixed
|
|
||||||
z-index 10000
|
|
||||||
top 0
|
|
||||||
right 0
|
|
||||||
left 0
|
|
||||||
bottom 0
|
|
||||||
margin auto
|
|
||||||
width 150px
|
|
||||||
height 150px
|
|
||||||
background var(--face)
|
|
||||||
border-radius 8px
|
|
||||||
opacity 0
|
|
||||||
|
|
||||||
> .icon
|
|
||||||
display flex
|
|
||||||
justify-content center
|
|
||||||
position absolute
|
|
||||||
top 0
|
|
||||||
right 0
|
|
||||||
left 0
|
|
||||||
bottom 0
|
|
||||||
width 5em
|
|
||||||
height 5em
|
|
||||||
margin auto
|
|
||||||
border .25em solid transparent
|
|
||||||
border-radius 50%
|
|
||||||
line-height 5em
|
|
||||||
cursor default
|
|
||||||
box-sizing content-box
|
|
||||||
user-select none
|
|
||||||
zoom normal
|
|
||||||
border-color #a5dc86
|
|
||||||
|
|
||||||
> .circle
|
|
||||||
position absolute
|
|
||||||
width 3.75em
|
|
||||||
height 7.5em
|
|
||||||
transform rotate(45deg)
|
|
||||||
border-radius 50%
|
|
||||||
background var(--face)
|
|
||||||
|
|
||||||
&.left
|
|
||||||
top -.4375em
|
|
||||||
left -2.0635em
|
|
||||||
transform rotate(-45deg)
|
|
||||||
transform-origin 3.75em 3.75em
|
|
||||||
border-radius 7.5em 0 0 7.5em
|
|
||||||
|
|
||||||
&.right
|
|
||||||
top -.6875em
|
|
||||||
left 1.875em
|
|
||||||
transform rotate(-45deg)
|
|
||||||
transform-origin 0 3.75em
|
|
||||||
border-radius 0 7.5em 7.5em 0
|
|
||||||
animation swal2-rotate-success-circular-line 4.25s ease-in
|
|
||||||
|
|
||||||
> .check
|
|
||||||
display block
|
|
||||||
position absolute
|
|
||||||
height .3125em
|
|
||||||
border-radius .125em
|
|
||||||
background-color #a5dc86
|
|
||||||
z-index 2
|
|
||||||
|
|
||||||
&.tip
|
|
||||||
top 2.875em
|
|
||||||
left .875em
|
|
||||||
width 1.5625em
|
|
||||||
transform rotate(45deg)
|
|
||||||
animation swal2-animate-success-line-tip .75s
|
|
||||||
|
|
||||||
&.long
|
|
||||||
top 2.375em
|
|
||||||
right .5em
|
|
||||||
width 2.9375em
|
|
||||||
transform rotate(-45deg)
|
|
||||||
animation swal2-animate-success-line-long .75s
|
|
||||||
|
|
||||||
> .fix
|
|
||||||
position absolute
|
|
||||||
top .5em
|
|
||||||
left 1.625em
|
|
||||||
width .4375em
|
|
||||||
height 5.625em
|
|
||||||
transform rotate(-45deg)
|
|
||||||
z-index 1
|
|
||||||
background var(--face)
|
|
||||||
|
|
||||||
> .ring
|
|
||||||
position absolute
|
|
||||||
top -.25em
|
|
||||||
left -.25em
|
|
||||||
width 100%
|
|
||||||
height 100%
|
|
||||||
border .25em solid rgba(165,220,134,.3)
|
|
||||||
border-radius 50%
|
|
||||||
z-index 2
|
|
||||||
box-sizing content-box
|
|
||||||
</style>
|
|
@@ -25,12 +25,9 @@ export default Vue.extend({
|
|||||||
type: 'password'
|
type: 'password'
|
||||||
}).then(newPassword2 => {
|
}).then(newPassword2 => {
|
||||||
if (newPassword !== newPassword2) {
|
if (newPassword !== newPassword2) {
|
||||||
this.$dialog({
|
this.$root.alert({
|
||||||
title: null,
|
title: null,
|
||||||
text: this.$t('not-match'),
|
text: this.$t('not-match')
|
||||||
actions: [{
|
|
||||||
text: 'OK'
|
|
||||||
}]
|
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@@ -193,7 +193,7 @@ export default Vue.extend({
|
|||||||
this.$store.state.i.bannerUrl = i.bannerUrl;
|
this.$store.state.i.bannerUrl = i.bannerUrl;
|
||||||
|
|
||||||
if (notify) {
|
if (notify) {
|
||||||
this.$swal({
|
this.$root.alert({
|
||||||
type: 'success',
|
type: 'success',
|
||||||
text: this.$t('saved')
|
text: this.$t('saved')
|
||||||
});
|
});
|
||||||
|
@@ -221,7 +221,7 @@ export default Vue.extend({
|
|||||||
try {
|
try {
|
||||||
theme = JSON5.parse(code);
|
theme = JSON5.parse(code);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
this.$swal({
|
this.$root.alert({
|
||||||
type: 'error',
|
type: 'error',
|
||||||
text: this.$t('invalid-theme')
|
text: this.$t('invalid-theme')
|
||||||
});
|
});
|
||||||
@@ -234,7 +234,7 @@ export default Vue.extend({
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (theme.id == null) {
|
if (theme.id == null) {
|
||||||
this.$swal({
|
this.$root.alert({
|
||||||
type: 'error',
|
type: 'error',
|
||||||
text: this.$t('invalid-theme')
|
text: this.$t('invalid-theme')
|
||||||
});
|
});
|
||||||
@@ -242,7 +242,7 @@ export default Vue.extend({
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (this.$store.state.device.themes.some(t => t.id == theme.id)) {
|
if (this.$store.state.device.themes.some(t => t.id == theme.id)) {
|
||||||
this.$swal({
|
this.$root.alert({
|
||||||
type: 'info',
|
type: 'info',
|
||||||
text: this.$t('already-installed')
|
text: this.$t('already-installed')
|
||||||
});
|
});
|
||||||
@@ -254,7 +254,7 @@ export default Vue.extend({
|
|||||||
key: 'themes', value: themes
|
key: 'themes', value: themes
|
||||||
});
|
});
|
||||||
|
|
||||||
this.$swal({
|
this.$root.alert({
|
||||||
type: 'success',
|
type: 'success',
|
||||||
text: this.$t('installed').replace('{}', theme.name)
|
text: this.$t('installed').replace('{}', theme.name)
|
||||||
});
|
});
|
||||||
@@ -267,7 +267,7 @@ export default Vue.extend({
|
|||||||
key: 'themes', value: themes
|
key: 'themes', value: themes
|
||||||
});
|
});
|
||||||
|
|
||||||
this.$swal({
|
this.$root.alert({
|
||||||
type: 'info',
|
type: 'info',
|
||||||
text: this.$t('uninstalled').replace('{}', theme.name)
|
text: this.$t('uninstalled').replace('{}', theme.name)
|
||||||
});
|
});
|
||||||
@@ -304,7 +304,7 @@ export default Vue.extend({
|
|||||||
const theme = this.myTheme;
|
const theme = this.myTheme;
|
||||||
|
|
||||||
if (theme.name == null || theme.name.trim() == '') {
|
if (theme.name == null || theme.name.trim() == '') {
|
||||||
this.$swal({
|
this.$root.alert({
|
||||||
type: 'warning',
|
type: 'warning',
|
||||||
text: this.$t('theme-name-required')
|
text: this.$t('theme-name-required')
|
||||||
});
|
});
|
||||||
@@ -318,7 +318,7 @@ export default Vue.extend({
|
|||||||
key: 'themes', value: themes
|
key: 'themes', value: themes
|
||||||
});
|
});
|
||||||
|
|
||||||
this.$swal({
|
this.$root.alert({
|
||||||
type: 'success',
|
type: 'success',
|
||||||
text: this.$t('saved')
|
text: this.$t('saved')
|
||||||
});
|
});
|
||||||
|
@@ -38,12 +38,24 @@ export default Vue.extend({
|
|||||||
type: Boolean,
|
type: Boolean,
|
||||||
required: false,
|
required: false,
|
||||||
default: false
|
default: false
|
||||||
}
|
},
|
||||||
|
autofocus: {
|
||||||
|
type: Boolean,
|
||||||
|
required: false,
|
||||||
|
default: false
|
||||||
|
},
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
styl: 'fill'
|
styl: 'fill'
|
||||||
};
|
};
|
||||||
|
},
|
||||||
|
mounted() {
|
||||||
|
if (this.autofocus) {
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.$el.focus();
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
@@ -57,6 +69,7 @@ export default Vue.extend({
|
|||||||
text-align center
|
text-align center
|
||||||
font-weight normal
|
font-weight normal
|
||||||
font-size 16px
|
font-size 16px
|
||||||
|
line-height 24px
|
||||||
border none
|
border none
|
||||||
border-radius 6px
|
border-radius 6px
|
||||||
outline none
|
outline none
|
||||||
@@ -85,6 +98,7 @@ export default Vue.extend({
|
|||||||
&.inline
|
&.inline
|
||||||
display inline-block
|
display inline-block
|
||||||
width auto
|
width auto
|
||||||
|
min-width 100px
|
||||||
|
|
||||||
&.primary
|
&.primary
|
||||||
font-weight bold
|
font-weight bold
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="pfzekjfwkwvadvlujpdnnxfggqgqjoze" :class="{ inputs }">
|
<div class="vnxwkwuf" :class="{ inputs, noGrow }">
|
||||||
<slot></slot>
|
<slot></slot>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -15,21 +15,27 @@ export default Vue.extend({
|
|||||||
type: Boolean,
|
type: Boolean,
|
||||||
required: false,
|
required: false,
|
||||||
default: false
|
default: false
|
||||||
|
},
|
||||||
|
noGrow: {
|
||||||
|
type: Boolean,
|
||||||
|
required: false,
|
||||||
|
default: false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="stylus" scoped>
|
<style lang="stylus" scoped>
|
||||||
.pfzekjfwkwvadvlujpdnnxfggqgqjoze
|
.vnxwkwuf
|
||||||
display flex
|
|
||||||
|
|
||||||
&.inputs
|
&.inputs
|
||||||
margin 32px 0
|
margin 32px 0
|
||||||
|
|
||||||
|
&:not(.noGrow)
|
||||||
|
display flex
|
||||||
|
|
||||||
> *
|
> *
|
||||||
flex 1
|
flex 1
|
||||||
|
|
||||||
&:not(:last-child)
|
> *:not(:last-child)
|
||||||
margin-right 16px
|
margin-right 16px
|
||||||
</style>
|
</style>
|
||||||
|
@@ -57,17 +57,11 @@ export default Vue.extend({
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Upload if the file didn't exist yet
|
|
||||||
const buf = new Uint8Array(e.target.result);
|
|
||||||
let bin = '';
|
|
||||||
// We use for-of loop instead of apply() to avoid RangeError
|
|
||||||
// SEE: https://stackoverflow.com/questions/9267899/arraybuffer-to-base64-encoded-string
|
|
||||||
for (const byte of buf) bin += String.fromCharCode(byte);
|
|
||||||
const ctx = {
|
const ctx = {
|
||||||
id: id,
|
id: id,
|
||||||
name: file.name || 'untitled',
|
name: file.name || 'untitled',
|
||||||
progress: undefined,
|
progress: undefined,
|
||||||
img: 'data:*/*;base64,' + btoa(bin)
|
img: window.URL.createObjectURL(file)
|
||||||
};
|
};
|
||||||
|
|
||||||
this.uploads.push(ctx);
|
this.uploads.push(ctx);
|
||||||
|
@@ -8,12 +8,9 @@ export default ($root: any) => {
|
|||||||
|
|
||||||
const regex = RegExp('\.(jpg|jpeg|png|gif|webp|bmp|tiff)$');
|
const regex = RegExp('\.(jpg|jpeg|png|gif|webp|bmp|tiff)$');
|
||||||
if (!regex.test(file.name) ) {
|
if (!regex.test(file.name) ) {
|
||||||
$root.$dialog({
|
$root.alert({
|
||||||
title: '%fa:info-circle% %i18n:desktop.invalid-filetype%',
|
title: '%fa:info-circle% %i18n:desktop.invalid-filetype%',
|
||||||
text: null,
|
text: null
|
||||||
actions: [{
|
|
||||||
text: '%i18n:common.got-it%'
|
|
||||||
}]
|
|
||||||
});
|
});
|
||||||
return reject('invalid-filetype');
|
return reject('invalid-filetype');
|
||||||
}
|
}
|
||||||
@@ -90,12 +87,9 @@ export default ($root: any) => {
|
|||||||
value: i.avatarUrl
|
value: i.avatarUrl
|
||||||
});
|
});
|
||||||
|
|
||||||
$root.$dialog({
|
$root.alert({
|
||||||
title: '%fa:info-circle% %i18n:desktop.avatar-updated%',
|
title: '%fa:info-circle% %i18n:desktop.avatar-updated%',
|
||||||
text: null,
|
text: null
|
||||||
actions: [{
|
|
||||||
text: '%i18n:common.got-it%'
|
|
||||||
}]
|
|
||||||
});
|
});
|
||||||
|
|
||||||
return i;
|
return i;
|
||||||
|
@@ -10,10 +10,7 @@ export default ($root: any) => {
|
|||||||
if (!regex.test(file.name) ) {
|
if (!regex.test(file.name) ) {
|
||||||
$root.dialog({
|
$root.dialog({
|
||||||
title: '%fa:info-circle% %i18n:desktop.invalid-filetype%',
|
title: '%fa:info-circle% %i18n:desktop.invalid-filetype%',
|
||||||
text: null,
|
text: null
|
||||||
actions: [{
|
|
||||||
text: '%i18n:common.got-it%'
|
|
||||||
}]
|
|
||||||
});
|
});
|
||||||
return reject('invalid-filetype');
|
return reject('invalid-filetype');
|
||||||
}
|
}
|
||||||
@@ -90,12 +87,9 @@ export default ($root: any) => {
|
|||||||
value: i.bannerUrl
|
value: i.bannerUrl
|
||||||
});
|
});
|
||||||
|
|
||||||
$root.$dialog({
|
$root.alert({
|
||||||
title: '%fa:info-circle% %i18n:desktop.banner-updated%',
|
title: '%fa:info-circle% %i18n:desktop.banner-updated%',
|
||||||
text: null,
|
text: null
|
||||||
actions: [{
|
|
||||||
text: '%i18n:common.got-it%'
|
|
||||||
}]
|
|
||||||
});
|
});
|
||||||
|
|
||||||
return i;
|
return i;
|
||||||
|
@@ -34,7 +34,6 @@ import PostFormWindow from './views/components/post-form-window.vue';
|
|||||||
import RenoteFormWindow from './views/components/renote-form-window.vue';
|
import RenoteFormWindow from './views/components/renote-form-window.vue';
|
||||||
import MkChooseFileFromDriveWindow from './views/components/choose-file-from-drive-window.vue';
|
import MkChooseFileFromDriveWindow from './views/components/choose-file-from-drive-window.vue';
|
||||||
import MkChooseFolderFromDriveWindow from './views/components/choose-folder-from-drive-window.vue';
|
import MkChooseFolderFromDriveWindow from './views/components/choose-folder-from-drive-window.vue';
|
||||||
import Dialog from './views/components/dialog.vue';
|
|
||||||
import InputDialog from './views/components/input-dialog.vue';
|
import InputDialog from './views/components/input-dialog.vue';
|
||||||
import Notification from './views/components/ui-notification.vue';
|
import Notification from './views/components/ui-notification.vue';
|
||||||
|
|
||||||
@@ -114,21 +113,6 @@ init(async (launch) => {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
$dialog(opts) {
|
|
||||||
return new Promise<string>((res, rej) => {
|
|
||||||
const o = opts || {};
|
|
||||||
const d = this.$root.new(Dialog, {
|
|
||||||
title: o.title,
|
|
||||||
text: o.text,
|
|
||||||
modal: o.modal,
|
|
||||||
buttons: o.actions
|
|
||||||
});
|
|
||||||
d.$once('clicked', id => {
|
|
||||||
res(id);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
},
|
|
||||||
|
|
||||||
$input(opts) {
|
$input(opts) {
|
||||||
return new Promise<string>((res, rej) => {
|
return new Promise<string>((res, rej) => {
|
||||||
const o = opts || {};
|
const o = opts || {};
|
||||||
|
@@ -1,168 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="mk-dialog">
|
|
||||||
<div class="bg" ref="bg" @click="onBgClick"></div>
|
|
||||||
<div class="main" ref="main">
|
|
||||||
<header v-html="title" :class="$style.header"></header>
|
|
||||||
<div class="body" v-html="text"></div>
|
|
||||||
<div class="buttons">
|
|
||||||
<button v-for="button in buttons" @click="click(button)">{{ button.text }}</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
import Vue from 'vue';
|
|
||||||
import * as anime from 'animejs';
|
|
||||||
|
|
||||||
export default Vue.extend({
|
|
||||||
props: {
|
|
||||||
title: {
|
|
||||||
type: String,
|
|
||||||
required: false
|
|
||||||
},
|
|
||||||
text: {
|
|
||||||
type: String,
|
|
||||||
required: true
|
|
||||||
},
|
|
||||||
buttons: {
|
|
||||||
type: Array,
|
|
||||||
default: () => {
|
|
||||||
return [{
|
|
||||||
text: 'OK'
|
|
||||||
}];
|
|
||||||
}
|
|
||||||
},
|
|
||||||
modal: {
|
|
||||||
type: Boolean,
|
|
||||||
default: false
|
|
||||||
}
|
|
||||||
},
|
|
||||||
mounted() {
|
|
||||||
this.$nextTick(() => {
|
|
||||||
(this.$refs.bg as any).style.pointerEvents = 'auto';
|
|
||||||
anime({
|
|
||||||
targets: this.$refs.bg,
|
|
||||||
opacity: 1,
|
|
||||||
duration: 100,
|
|
||||||
easing: 'linear'
|
|
||||||
});
|
|
||||||
|
|
||||||
anime({
|
|
||||||
targets: this.$refs.main,
|
|
||||||
opacity: 1,
|
|
||||||
scale: [1.2, 1],
|
|
||||||
duration: 300,
|
|
||||||
easing: [0, 0.5, 0.5, 1]
|
|
||||||
});
|
|
||||||
});
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
click(button) {
|
|
||||||
this.$emit('clicked', button.id);
|
|
||||||
this.close();
|
|
||||||
},
|
|
||||||
close() {
|
|
||||||
(this.$refs.bg as any).style.pointerEvents = 'none';
|
|
||||||
anime({
|
|
||||||
targets: this.$refs.bg,
|
|
||||||
opacity: 0,
|
|
||||||
duration: 300,
|
|
||||||
easing: 'linear'
|
|
||||||
});
|
|
||||||
|
|
||||||
(this.$refs.main as any).style.pointerEvents = 'none';
|
|
||||||
anime({
|
|
||||||
targets: this.$refs.main,
|
|
||||||
opacity: 0,
|
|
||||||
scale: 0.8,
|
|
||||||
duration: 300,
|
|
||||||
easing: [ 0.5, -0.5, 1, 0.5 ],
|
|
||||||
complete: () => this.destroyDom()
|
|
||||||
});
|
|
||||||
},
|
|
||||||
onBgClick() {
|
|
||||||
if (!this.modal) {
|
|
||||||
this.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style lang="stylus" scoped>
|
|
||||||
.mk-dialog
|
|
||||||
> .bg
|
|
||||||
display block
|
|
||||||
position fixed
|
|
||||||
z-index 8192
|
|
||||||
top 0
|
|
||||||
left 0
|
|
||||||
width 100%
|
|
||||||
height 100%
|
|
||||||
background rgba(#000, 0.7)
|
|
||||||
opacity 0
|
|
||||||
pointer-events none
|
|
||||||
|
|
||||||
> .main
|
|
||||||
display block
|
|
||||||
position fixed
|
|
||||||
z-index 8192
|
|
||||||
top 20%
|
|
||||||
left 0
|
|
||||||
right 0
|
|
||||||
margin 0 auto 0 auto
|
|
||||||
padding 32px 42px
|
|
||||||
width 480px
|
|
||||||
background #fff
|
|
||||||
opacity 0
|
|
||||||
|
|
||||||
> .body
|
|
||||||
margin 1em 0
|
|
||||||
color #888
|
|
||||||
|
|
||||||
> .buttons
|
|
||||||
> button
|
|
||||||
display inline-block
|
|
||||||
float right
|
|
||||||
margin 0
|
|
||||||
padding 10px 10px
|
|
||||||
font-size 1.1em
|
|
||||||
font-weight normal
|
|
||||||
text-decoration none
|
|
||||||
color #888
|
|
||||||
background transparent
|
|
||||||
outline none
|
|
||||||
border none
|
|
||||||
border-radius 0
|
|
||||||
cursor pointer
|
|
||||||
transition color 0.1s ease
|
|
||||||
|
|
||||||
i
|
|
||||||
margin 0 0.375em
|
|
||||||
|
|
||||||
&:hover
|
|
||||||
color var(--primary)
|
|
||||||
|
|
||||||
&:active
|
|
||||||
color var(--primaryDarken10)
|
|
||||||
transition color 0s ease
|
|
||||||
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style lang="stylus" module>
|
|
||||||
|
|
||||||
|
|
||||||
.header
|
|
||||||
margin 1em 0
|
|
||||||
color var(--primary)
|
|
||||||
// color #43A4EC
|
|
||||||
font-weight bold
|
|
||||||
|
|
||||||
&:empty
|
|
||||||
display none
|
|
||||||
|
|
||||||
> i
|
|
||||||
margin-right 0.5em
|
|
||||||
|
|
||||||
</style>
|
|
@@ -170,12 +170,9 @@ export default Vue.extend({
|
|||||||
|
|
||||||
copyUrl() {
|
copyUrl() {
|
||||||
copyToClipboard(this.file.url);
|
copyToClipboard(this.file.url);
|
||||||
this.$dialog({
|
this.$root.alert({
|
||||||
title: this.$t('contextmenu.copied'),
|
title: this.$t('contextmenu.copied'),
|
||||||
text: this.$t('contextmenu.copied-url-to-clipboard'),
|
text: this.$t('contextmenu.copied-url-to-clipboard')
|
||||||
actions: [{
|
|
||||||
text: this.$t('@.ok')
|
|
||||||
}]
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@@ -155,12 +155,9 @@ export default Vue.extend({
|
|||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
switch (err) {
|
switch (err) {
|
||||||
case 'detected-circular-definition':
|
case 'detected-circular-definition':
|
||||||
this.$dialog({
|
this.$root.alert({
|
||||||
title: this.$t('unable-to-process'),
|
title: this.$t('unable-to-process'),
|
||||||
text: this.$t('circular-reference-detected'),
|
text: this.$t('circular-reference-detected')
|
||||||
actions: [{
|
|
||||||
text: this.$t('@.ok')
|
|
||||||
}]
|
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@@ -313,12 +313,9 @@ export default Vue.extend({
|
|||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
switch (err) {
|
switch (err) {
|
||||||
case 'detected-circular-definition':
|
case 'detected-circular-definition':
|
||||||
this.$dialog({
|
this.$root.alert({
|
||||||
title: this.$t('unable-to-process'),
|
title: this.$t('unable-to-process'),
|
||||||
text: this.$t('circular-reference-detected'),
|
text: this.$t('circular-reference-detected')
|
||||||
actions: [{
|
|
||||||
text: this.$t('@.ok')
|
|
||||||
}]
|
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
@@ -343,12 +340,9 @@ export default Vue.extend({
|
|||||||
folderId: this.folder ? this.folder.id : undefined
|
folderId: this.folder ? this.folder.id : undefined
|
||||||
});
|
});
|
||||||
|
|
||||||
this.$dialog({
|
this.$root.alert({
|
||||||
title: this.$t('url-upload-requested'),
|
title: this.$t('url-upload-requested'),
|
||||||
text: this.$t('may-take-time'),
|
text: this.$t('may-take-time')
|
||||||
actions: [{
|
|
||||||
text: this.$t('@.ok')
|
|
||||||
}]
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
@@ -186,12 +186,9 @@ export default Vue.extend({
|
|||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
hint() {
|
hint() {
|
||||||
this.$dialog({
|
this.$root.alert({
|
||||||
title: this.$t('@.customization-tips.title'),
|
title: this.$t('@.customization-tips.title'),
|
||||||
text: this.$t('@.customization-tips.paragraph'),
|
text: this.$t('@.customization-tips.paragraph')
|
||||||
actions: [{
|
|
||||||
text: this.$t('@.customization-tips.gotit')
|
|
||||||
}]
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@@ -549,12 +549,12 @@ export default Vue.extend({
|
|||||||
this.checkingForUpdate = false;
|
this.checkingForUpdate = false;
|
||||||
this.latestVersion = newer;
|
this.latestVersion = newer;
|
||||||
if (newer == null) {
|
if (newer == null) {
|
||||||
this.$dialog({
|
this.$root.alert({
|
||||||
title: this.$t('no-updates'),
|
title: this.$t('no-updates'),
|
||||||
text: this.$t('no-updates-desc')
|
text: this.$t('no-updates-desc')
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
this.$dialog({
|
this.$root.alert({
|
||||||
title: this.$t('update-available'),
|
title: this.$t('update-available'),
|
||||||
text: this.$t('update-available-desc')
|
text: this.$t('update-available-desc')
|
||||||
});
|
});
|
||||||
@@ -563,7 +563,7 @@ export default Vue.extend({
|
|||||||
},
|
},
|
||||||
clean() {
|
clean() {
|
||||||
localStorage.clear();
|
localStorage.clear();
|
||||||
this.$dialog({
|
this.$root.alert({
|
||||||
title: this.$t('cache-cleared'),
|
title: this.$t('cache-cleared'),
|
||||||
text: this.$t('cache-cleared-desc')
|
text: this.$t('cache-cleared-desc')
|
||||||
});
|
});
|
||||||
|
@@ -87,7 +87,6 @@ import XNotes from './deck.notes.vue';
|
|||||||
import XNote from '../../components/note.vue';
|
import XNote from '../../components/note.vue';
|
||||||
import Menu from '../../../../common/views/components/menu.vue';
|
import Menu from '../../../../common/views/components/menu.vue';
|
||||||
import MkUserListsWindow from '../../components/user-lists-window.vue';
|
import MkUserListsWindow from '../../components/user-lists-window.vue';
|
||||||
import Ok from '../../../../common/views/components/ok.vue';
|
|
||||||
import { concat } from '../../../../../../prelude/array';
|
import { concat } from '../../../../../../prelude/array';
|
||||||
import * as ApexCharts from 'apexcharts';
|
import * as ApexCharts from 'apexcharts';
|
||||||
|
|
||||||
@@ -308,7 +307,8 @@ export default Vue.extend({
|
|||||||
listId: list.id,
|
listId: list.id,
|
||||||
userId: this.user.id
|
userId: this.user.id
|
||||||
});
|
});
|
||||||
this.$root.new(Ok);
|
// TODO
|
||||||
|
//this.$root.new(Ok);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}];
|
}];
|
||||||
|
@@ -14,8 +14,8 @@
|
|||||||
<span v-else><fa :icon="['far', 'eye-slash']"/> {{ $t('mute') }}</span>
|
<span v-else><fa :icon="['far', 'eye-slash']"/> {{ $t('mute') }}</span>
|
||||||
</ui-button>
|
</ui-button>
|
||||||
<ui-button @click="user.isBlocking ? unblock() : block()" v-if="$store.state.i.id != user.id">
|
<ui-button @click="user.isBlocking ? unblock() : block()" v-if="$store.state.i.id != user.id">
|
||||||
<span v-if="user.isBlocking"><fa icon="user"/> {{ $t('unblock') }}</span>
|
<span v-if="user.isBlocking"><fa icon="ban"/> {{ $t('unblock') }}</span>
|
||||||
<span v-else><fa icon="user-slash"/> {{ $t('block') }}</span>
|
<span v-else><fa icon="ban"/> {{ $t('block') }}</span>
|
||||||
</ui-button>
|
</ui-button>
|
||||||
<ui-button @click="list"><fa icon="list"/> {{ $t('push-to-a-list') }}</ui-button>
|
<ui-button @click="list"><fa icon="list"/> {{ $t('push-to-a-list') }}</ui-button>
|
||||||
</div>
|
</div>
|
||||||
@@ -73,7 +73,13 @@ export default Vue.extend({
|
|||||||
},
|
},
|
||||||
|
|
||||||
block() {
|
block() {
|
||||||
if (!window.confirm(this.$t('block-confirm'))) return;
|
this.$root.alert({
|
||||||
|
type: 'warning',
|
||||||
|
text: this.$t('block-confirm'),
|
||||||
|
showCancelButton: true
|
||||||
|
}).then(res => {
|
||||||
|
if (!res) return;
|
||||||
|
|
||||||
this.$root.api('blocking/create', {
|
this.$root.api('blocking/create', {
|
||||||
userId: this.user.id
|
userId: this.user.id
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
@@ -81,6 +87,7 @@ export default Vue.extend({
|
|||||||
}, () => {
|
}, () => {
|
||||||
alert('error');
|
alert('error');
|
||||||
});
|
});
|
||||||
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
unblock() {
|
unblock() {
|
||||||
@@ -101,7 +108,7 @@ export default Vue.extend({
|
|||||||
listId: list.id,
|
listId: list.id,
|
||||||
userId: this.user.id
|
userId: this.user.id
|
||||||
});
|
});
|
||||||
this.$dialog({
|
this.$root.alert({
|
||||||
title: 'Done!',
|
title: 'Done!',
|
||||||
text: this.$t('list-pushed').replace('{user}', this.user.name).replace('{list}', list.title)
|
text: this.$t('list-pushed').replace('{user}', this.user.name).replace('{list}', list.title)
|
||||||
});
|
});
|
||||||
|
@@ -7,7 +7,6 @@ import Vuex from 'vuex';
|
|||||||
import VueRouter from 'vue-router';
|
import VueRouter from 'vue-router';
|
||||||
import VAnimateCss from 'v-animate-css';
|
import VAnimateCss from 'v-animate-css';
|
||||||
import VModal from 'vue-js-modal';
|
import VModal from 'vue-js-modal';
|
||||||
import VueSweetalert2 from 'vue-sweetalert2';
|
|
||||||
import VueI18n from 'vue-i18n';
|
import VueI18n from 'vue-i18n';
|
||||||
|
|
||||||
import VueHotkey from './common/hotkey';
|
import VueHotkey from './common/hotkey';
|
||||||
@@ -16,6 +15,7 @@ import checkForUpdate from './common/scripts/check-for-update';
|
|||||||
import MiOS from './mios';
|
import MiOS from './mios';
|
||||||
import { clientVersion as version, codename, lang } from './config';
|
import { clientVersion as version, codename, lang } from './config';
|
||||||
import { builtinThemes, lightTheme, applyTheme } from './theme';
|
import { builtinThemes, lightTheme, applyTheme } from './theme';
|
||||||
|
import Alert from './common/views/components/alert.vue';
|
||||||
|
|
||||||
if (localStorage.getItem('theme') == null) {
|
if (localStorage.getItem('theme') == null) {
|
||||||
applyTheme(lightTheme);
|
applyTheme(lightTheme);
|
||||||
@@ -111,7 +111,10 @@ import {
|
|||||||
faServer,
|
faServer,
|
||||||
faExclamationCircle,
|
faExclamationCircle,
|
||||||
faSpinner,
|
faSpinner,
|
||||||
faBroadcastTower
|
faBroadcastTower,
|
||||||
|
faChartLine,
|
||||||
|
faEllipsisV,
|
||||||
|
faStickyNote,
|
||||||
} from '@fortawesome/free-solid-svg-icons';
|
} from '@fortawesome/free-solid-svg-icons';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
@@ -227,6 +230,9 @@ library.add(
|
|||||||
faExclamationCircle,
|
faExclamationCircle,
|
||||||
faSpinner,
|
faSpinner,
|
||||||
faBroadcastTower,
|
faBroadcastTower,
|
||||||
|
faChartLine,
|
||||||
|
faEllipsisV,
|
||||||
|
faStickyNote,
|
||||||
|
|
||||||
farBell,
|
farBell,
|
||||||
farEnvelope,
|
farEnvelope,
|
||||||
@@ -256,7 +262,6 @@ Vue.use(VueRouter);
|
|||||||
Vue.use(VAnimateCss);
|
Vue.use(VAnimateCss);
|
||||||
Vue.use(VModal);
|
Vue.use(VModal);
|
||||||
Vue.use(VueHotkey);
|
Vue.use(VueHotkey);
|
||||||
Vue.use(VueSweetalert2);
|
|
||||||
Vue.use(VueI18n);
|
Vue.use(VueI18n);
|
||||||
|
|
||||||
Vue.component('fa', FontAwesomeIcon);
|
Vue.component('fa', FontAwesomeIcon);
|
||||||
@@ -428,6 +433,13 @@ export default (callback: (launch: (router: VueRouter) => [Vue, MiOS]) => void,
|
|||||||
document.body.appendChild(x.$el);
|
document.body.appendChild(x.$el);
|
||||||
return x;
|
return x;
|
||||||
},
|
},
|
||||||
|
alert(opts) {
|
||||||
|
return new Promise((res) => {
|
||||||
|
const vm = this.new(Alert, opts);
|
||||||
|
vm.$once('ok', () => res(true));
|
||||||
|
vm.$once('cancel', () => res(false));
|
||||||
|
});
|
||||||
|
}
|
||||||
},
|
},
|
||||||
router,
|
router,
|
||||||
render: createEl => createEl(App)
|
render: createEl => createEl(App)
|
||||||
|
@@ -172,7 +172,7 @@ export default class MiOS extends EventEmitter {
|
|||||||
callback();
|
callback();
|
||||||
|
|
||||||
// Init service worker
|
// Init service worker
|
||||||
if (this.shouldRegisterSw) this.registerSw();
|
//if (this.shouldRegisterSw) this.registerSw();
|
||||||
};
|
};
|
||||||
|
|
||||||
// キャッシュがあったとき
|
// キャッシュがあったとき
|
||||||
@@ -365,7 +365,7 @@ export default class MiOS extends EventEmitter {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// The path of service worker script
|
// The path of service worker script
|
||||||
const sw = `/sw.${version}.${lang}.js`;
|
const sw = `/sw.${version}.js`;
|
||||||
|
|
||||||
// Register service worker
|
// Register service worker
|
||||||
navigator.serviceWorker.register(sw).then(registration => {
|
navigator.serviceWorker.register(sw).then(registration => {
|
||||||
|
@@ -35,7 +35,6 @@ import MkFollow from '../common/views/pages/follow.vue';
|
|||||||
import PostForm from './views/components/post-form-dialog.vue';
|
import PostForm from './views/components/post-form-dialog.vue';
|
||||||
import FileChooser from './views/components/drive-file-chooser.vue';
|
import FileChooser from './views/components/drive-file-chooser.vue';
|
||||||
import FolderChooser from './views/components/drive-folder-chooser.vue';
|
import FolderChooser from './views/components/drive-folder-chooser.vue';
|
||||||
import Dialog from './views/components/dialog.vue';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* init
|
* init
|
||||||
@@ -99,21 +98,6 @@ init((launch) => {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
$dialog(opts) {
|
|
||||||
return new Promise<string>((res, rej) => {
|
|
||||||
const o = opts || {};
|
|
||||||
const d = this.$root.new(Dialog, {
|
|
||||||
title: o.title,
|
|
||||||
text: o.text,
|
|
||||||
modal: o.modal,
|
|
||||||
buttons: o.actions
|
|
||||||
});
|
|
||||||
d.$once('clicked', id => {
|
|
||||||
res(id);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
},
|
|
||||||
|
|
||||||
$notify(message) {
|
$notify(message) {
|
||||||
alert(message);
|
alert(message);
|
||||||
}
|
}
|
||||||
|
@@ -1,167 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="mk-dialog">
|
|
||||||
<div class="bg" ref="bg" @click="onBgClick"></div>
|
|
||||||
<div class="main" ref="main">
|
|
||||||
<header v-html="title" :class="$style.header"></header>
|
|
||||||
<div class="body" v-html="text"></div>
|
|
||||||
<div class="buttons">
|
|
||||||
<button v-for="button in buttons" @click="click(button)">{{ button.text }}</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
import Vue from 'vue';
|
|
||||||
import * as anime from 'animejs';
|
|
||||||
|
|
||||||
export default Vue.extend({
|
|
||||||
props: {
|
|
||||||
title: {
|
|
||||||
type: String,
|
|
||||||
required: false
|
|
||||||
},
|
|
||||||
text: {
|
|
||||||
type: String,
|
|
||||||
required: true
|
|
||||||
},
|
|
||||||
buttons: {
|
|
||||||
type: Array,
|
|
||||||
default: () => {
|
|
||||||
return [{
|
|
||||||
text: 'OK'
|
|
||||||
}];
|
|
||||||
}
|
|
||||||
},
|
|
||||||
modal: {
|
|
||||||
type: Boolean,
|
|
||||||
default: false
|
|
||||||
}
|
|
||||||
},
|
|
||||||
mounted() {
|
|
||||||
this.$nextTick(() => {
|
|
||||||
(this.$refs.bg as any).style.pointerEvents = 'auto';
|
|
||||||
anime({
|
|
||||||
targets: this.$refs.bg,
|
|
||||||
opacity: 1,
|
|
||||||
duration: 100,
|
|
||||||
easing: 'linear'
|
|
||||||
});
|
|
||||||
|
|
||||||
anime({
|
|
||||||
targets: this.$refs.main,
|
|
||||||
opacity: 1,
|
|
||||||
scale: [1.2, 1],
|
|
||||||
duration: 300,
|
|
||||||
easing: [0, 0.5, 0.5, 1]
|
|
||||||
});
|
|
||||||
});
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
click(button) {
|
|
||||||
this.$emit('clicked', button.id);
|
|
||||||
this.close();
|
|
||||||
},
|
|
||||||
close() {
|
|
||||||
(this.$refs.bg as any).style.pointerEvents = 'none';
|
|
||||||
anime({
|
|
||||||
targets: this.$refs.bg,
|
|
||||||
opacity: 0,
|
|
||||||
duration: 300,
|
|
||||||
easing: 'linear'
|
|
||||||
});
|
|
||||||
|
|
||||||
(this.$refs.main as any).style.pointerEvents = 'none';
|
|
||||||
anime({
|
|
||||||
targets: this.$refs.main,
|
|
||||||
opacity: 0,
|
|
||||||
scale: 0.8,
|
|
||||||
duration: 300,
|
|
||||||
easing: [ 0.5, -0.5, 1, 0.5 ],
|
|
||||||
complete: () => this.destroyDom()
|
|
||||||
});
|
|
||||||
},
|
|
||||||
onBgClick() {
|
|
||||||
if (!this.modal) {
|
|
||||||
this.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style lang="stylus" scoped>
|
|
||||||
.mk-dialog
|
|
||||||
> .bg
|
|
||||||
display block
|
|
||||||
position fixed
|
|
||||||
z-index 8192
|
|
||||||
top 0
|
|
||||||
left 0
|
|
||||||
width 100%
|
|
||||||
height 100%
|
|
||||||
background rgba(#000, 0.7)
|
|
||||||
opacity 0
|
|
||||||
pointer-events none
|
|
||||||
|
|
||||||
> .main
|
|
||||||
display block
|
|
||||||
position fixed
|
|
||||||
z-index 8192
|
|
||||||
top 20%
|
|
||||||
left 0
|
|
||||||
right 0
|
|
||||||
margin 0 auto 0 auto
|
|
||||||
padding 16px
|
|
||||||
width calc(100% - 32px)
|
|
||||||
max-width 300px
|
|
||||||
background #fff
|
|
||||||
opacity 0
|
|
||||||
|
|
||||||
> .body
|
|
||||||
margin 1em 0
|
|
||||||
color #888
|
|
||||||
|
|
||||||
> .buttons
|
|
||||||
> button
|
|
||||||
display inline-block
|
|
||||||
float right
|
|
||||||
margin 0
|
|
||||||
padding 0 10px
|
|
||||||
font-size 1.1em
|
|
||||||
font-weight normal
|
|
||||||
text-decoration none
|
|
||||||
color #888
|
|
||||||
background transparent
|
|
||||||
outline none
|
|
||||||
border none
|
|
||||||
border-radius 0
|
|
||||||
cursor pointer
|
|
||||||
transition color 0.1s ease
|
|
||||||
|
|
||||||
i
|
|
||||||
margin 0 0.375em
|
|
||||||
|
|
||||||
&:hover
|
|
||||||
color var(--primary)
|
|
||||||
|
|
||||||
&:active
|
|
||||||
color var(--primaryDarken10)
|
|
||||||
transition color 0s ease
|
|
||||||
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style lang="stylus" module>
|
|
||||||
.header
|
|
||||||
margin 0 0 1em 0
|
|
||||||
color var(--primary)
|
|
||||||
// color #43A4EC
|
|
||||||
font-weight bold
|
|
||||||
|
|
||||||
&:empty
|
|
||||||
display none
|
|
||||||
|
|
||||||
> i
|
|
||||||
margin-right 0.5em
|
|
||||||
|
|
||||||
</style>
|
|
@@ -60,6 +60,6 @@ export default Vue.extend({
|
|||||||
width 42px
|
width 42px
|
||||||
height 100%
|
height 100%
|
||||||
font-size 15px
|
font-size 15px
|
||||||
color #465258
|
color var(--faceTextButton)
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
@@ -23,10 +23,15 @@ export default Vue.extend({
|
|||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
fn() {
|
fn() {
|
||||||
const ok = window.confirm(this.$t('read-all'));
|
this.$root.alert({
|
||||||
if (!ok) return;
|
type: 'warning',
|
||||||
|
text: this.$t('read-all'),
|
||||||
|
showCancelButton: true
|
||||||
|
}).then(res => {
|
||||||
|
if (!res) return;
|
||||||
|
|
||||||
this.$root.api('notifications/mark_all_as_read');
|
this.$root.api('notifications/mark_all_as_read');
|
||||||
|
});
|
||||||
},
|
},
|
||||||
onFetched() {
|
onFetched() {
|
||||||
Progress.done();
|
Progress.done();
|
||||||
|
@@ -360,12 +360,12 @@ export default Vue.extend({
|
|||||||
this.checkingForUpdate = false;
|
this.checkingForUpdate = false;
|
||||||
this.latestVersion = newer;
|
this.latestVersion = newer;
|
||||||
if (newer == null) {
|
if (newer == null) {
|
||||||
this.$dialog({
|
this.$root.alert({
|
||||||
title: this.$t('no-updates'),
|
title: this.$t('no-updates'),
|
||||||
text: this.$t('no-updates-desc')
|
text: this.$t('no-updates-desc')
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
this.$dialog({
|
this.$root.alert({
|
||||||
title: this.$t('update-available'),
|
title: this.$t('update-available'),
|
||||||
text: this.$t('update-available-desc')
|
text: this.$t('update-available-desc')
|
||||||
});
|
});
|
||||||
|
@@ -138,7 +138,7 @@ export default Vue.extend({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
icon: this.user.isBlocking ? ['fas', 'user'] : ['fas', 'user-slash'],
|
icon: 'ban',
|
||||||
text: this.user.isBlocking ? this.$t('unblock') : this.$t('block'),
|
text: this.user.isBlocking ? this.$t('unblock') : this.$t('block'),
|
||||||
action: () => {
|
action: () => {
|
||||||
if (this.user.isBlocking) {
|
if (this.user.isBlocking) {
|
||||||
|
@@ -180,6 +180,8 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
|
|||||||
query.createdAt = {
|
query.createdAt = {
|
||||||
$lt: new Date(ps.untilDate)
|
$lt: new Date(ps.untilDate)
|
||||||
};
|
};
|
||||||
|
} else {
|
||||||
|
sort._id = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ps.includeReplies) {
|
if (!ps.includeReplies) {
|
||||||
|
@@ -92,7 +92,7 @@ handler.on('push', event => {
|
|||||||
const compare = event.compare;
|
const compare = event.compare;
|
||||||
const commits: any[] = event.commits;
|
const commits: any[] = event.commits;
|
||||||
post([
|
post([
|
||||||
`Pushed by **${pusher.name}** with ?[${commits.length} commit${commits.length > 1 ? 's' : ''}](${compare}):`,
|
`🆕 Pushed by **${pusher.name}** with ?[${commits.length} commit${commits.length > 1 ? 's' : ''}](${compare}):`,
|
||||||
commits.reverse().map(commit => `・[?[${commit.id.substr(0, 7)}](${commit.url})] ${commit.message.split('\n')[0]}`).join('\n'),
|
commits.reverse().map(commit => `・[?[${commit.id.substr(0, 7)}](${commit.url})] ${commit.message.split('\n')[0]}`).join('\n'),
|
||||||
].join('\n'));
|
].join('\n'));
|
||||||
break;
|
break;
|
||||||
@@ -108,9 +108,9 @@ handler.on('issues', event => {
|
|||||||
const action = event.action;
|
const action = event.action;
|
||||||
let title: string;
|
let title: string;
|
||||||
switch (action) {
|
switch (action) {
|
||||||
case 'opened': title = 'Issue opened'; break;
|
case 'opened': title = '💥 Issue opened'; break;
|
||||||
case 'closed': title = 'Issue closed'; break;
|
case 'closed': title = '💮 Issue closed'; break;
|
||||||
case 'reopened': title = 'Issue reopened'; break;
|
case 'reopened': title = '🔥 Issue reopened'; break;
|
||||||
default: return;
|
default: return;
|
||||||
}
|
}
|
||||||
post(`${title}: <${issue.number}>「${issue.title}」\n${issue.html_url}`);
|
post(`${title}: <${issue.number}>「${issue.title}」\n${issue.html_url}`);
|
||||||
@@ -122,7 +122,7 @@ handler.on('issue_comment', event => {
|
|||||||
const action = event.action;
|
const action = event.action;
|
||||||
let text: string;
|
let text: string;
|
||||||
switch (action) {
|
switch (action) {
|
||||||
case 'created': text = `Commented to「${issue.title}」:${comment.user.login}「${comment.body}」\n${comment.html_url}`; break;
|
case 'created': text = `💬 Commented to「${issue.title}」:${comment.user.login}「${comment.body}」\n${comment.html_url}`; break;
|
||||||
default: return;
|
default: return;
|
||||||
}
|
}
|
||||||
post(text);
|
post(text);
|
||||||
@@ -143,12 +143,12 @@ handler.on('pull_request', event => {
|
|||||||
const action = event.action;
|
const action = event.action;
|
||||||
let text: string;
|
let text: string;
|
||||||
switch (action) {
|
switch (action) {
|
||||||
case 'opened': text = `New Pull Request:「${pr.title}」\n${pr.html_url}`; break;
|
case 'opened': text = `📦 New Pull Request:「${pr.title}」\n${pr.html_url}`; break;
|
||||||
case 'reopened': text = `Pull Request Reopened:「${pr.title}」\n${pr.html_url}`; break;
|
case 'reopened': text = `🗿 Pull Request Reopened:「${pr.title}」\n${pr.html_url}`; break;
|
||||||
case 'closed':
|
case 'closed':
|
||||||
text = pr.merged
|
text = pr.merged
|
||||||
? `Pull Request Merged!:「${pr.title}」\n${pr.html_url}`
|
? `💯 Pull Request Merged!:「${pr.title}」\n${pr.html_url}`
|
||||||
: `Pull Request Closed:「${pr.title}」\n${pr.html_url}`;
|
: `🚫 Pull Request Closed:「${pr.title}」\n${pr.html_url}`;
|
||||||
break;
|
break;
|
||||||
default: return;
|
default: return;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user