- 読み込み中
+ %i18n:@loading%
-
アプリケーションの連携をキャンセルしました。
-
このアプリがあなたのアカウントにアクセスすることはありません。
+
%i18n:@denied%
+
%i18n:@denied-paragraph%
-
{{ session.app.isAuthorized ? 'このアプリは既に連携済みです' : 'アプリケーションの連携を許可しました' }}
-
アプリケーションに戻っています
-
アプリケーションに戻って、やっていってください。
+
{{ session.app.isAuthorized ? '%i18n:@already-authorized%' : '%i18n:@allowed%' }}
+
%i18n:@callback-url%
+
%i18n:@please-go-back%
-
セッションが存在しません。
+
%i18n:@error%
- サインインしてください
+ %i18n:@sign-in%
diff --git a/src/client/app/common/scripts/compose-notification.ts b/src/client/app/common/scripts/compose-notification.ts
index c93609bc59..4fb0610fd7 100644
--- a/src/client/app/common/scripts/compose-notification.ts
+++ b/src/client/app/common/scripts/compose-notification.ts
@@ -15,22 +15,22 @@ export default function(type, data): Notification {
switch (type) {
case 'drive_file_created':
return {
- title: 'ファイルがアップロードされました',
+ title: '%i18n:common.notification.file-uploaded%',
body: data.name,
icon: data.url
};
case 'unread_messaging_message':
return {
- title: `${getUserName(data.user)}さんからメッセージ:`,
+ title: '%i18n:common.notification.message-from%'.split("{}")[0] + `${getUserName(data.user)}` + '%i18n:common.notification.message-from%'.split("{}")[1] ,
body: data.text, // TODO: getMessagingMessageSummary(data),
icon: data.user.avatarUrl
};
case 'reversi_invited':
return {
- title: '対局への招待があります',
- body: `${getUserName(data.parent)}さんから`,
+ title: '%i18n:common.notification.reversi-invited%',
+ body: '%i18n:common.notification.reversi-invited-by%'.split("{}")[0] + `${getUserName(data.parent)}` + '%i18n:common.notification.reversi-invited-by%'.split("{}")[1],
icon: data.parent.avatarUrl
};
@@ -38,21 +38,21 @@ export default function(type, data): Notification {
switch (data.type) {
case 'mention':
return {
- title: `${getUserName(data.user)}さんから:`,
+ title: '%i18n:common.notification.notified-by%'.split("{}")[0] + `${getUserName(data.user)}さんから:` + '%i18n:common.notification.notified-by%'.split("{}")[1],
body: getNoteSummary(data),
icon: data.user.avatarUrl
};
case 'reply':
return {
- title: `${getUserName(data.user)}さんから返信:`,
+ title: '%i18n:common.notification.reply-from%'.split("{}")[0] + `${getUserName(data.user)}` + '%i18n:common.notification.reply-from%'.split("{}")[1],
body: getNoteSummary(data),
icon: data.user.avatarUrl
};
case 'quote':
return {
- title: `${getUserName(data.user)}さんが引用:`,
+ title: '%i18n:common.notification.quoted-by%'.split("{}")[0] + `${getUserName(data.user)}` + '%i18n:common.notification.quoted-by%'.split("{}")[1],
body: getNoteSummary(data),
icon: data.user.avatarUrl
};
diff --git a/src/client/app/common/scripts/date-stringify.ts b/src/client/app/common/scripts/date-stringify.ts
index e51de8833d..2b8e525567 100644
--- a/src/client/app/common/scripts/date-stringify.ts
+++ b/src/client/app/common/scripts/date-stringify.ts
@@ -1,12 +1,12 @@
export default date => {
if (typeof date == 'string') date = new Date(date);
return (
- date.getFullYear() + '年' +
- (date.getMonth() + 1) + '月' +
- date.getDate() + '日' +
+ date.getFullYear() + '%i18n:common.date.full-year%' +
+ (date.getMonth() + 1) + '%i18n:common.date.month%' +
+ date.getDate() + '%i18n:common.date.day%' +
' ' +
- date.getHours() + '時' +
- date.getMinutes() + '分' +
+ date.getHours() + '%i18n:common.date.hours%' +
+ date.getMinutes() + '%i18n:common.date.minutes%' +
' ' +
`(${['日', '月', '火', '水', '木', '金', '土'][date.getDay()]})`
);
diff --git a/src/client/app/common/scripts/fuck-ad-block.ts b/src/client/app/common/scripts/fuck-ad-block.ts
index 9bcf7deeff..ed0904aeb3 100644
--- a/src/client/app/common/scripts/fuck-ad-block.ts
+++ b/src/client/app/common/scripts/fuck-ad-block.ts
@@ -5,8 +5,8 @@ declare const fuckAdBlock: any;
export default (os) => {
function adBlockDetected() {
os.apis.dialog({
- title: '%fa:exclamation-triangle%広告ブロッカーを無効にしてください',
- text: '
Misskeyは広告を掲載していませんが、広告をブロックする機能が有効だと一部の機能が利用できなかったり、不具合が発生する場合があります。',
+ title: '%fa:exclamation-triangle%%i18n:common.adblock.detected%',
+ text: '%i18n:common.adblock.warning%',
actins: [{
text: 'OK'
}]
diff --git a/src/client/app/common/views/pages/follow.vue b/src/client/app/common/views/pages/follow.vue
index 4b8c2d3b7c..e1b5b1f120 100644
--- a/src/client/app/common/views/pages/follow.vue
+++ b/src/client/app/common/views/pages/follow.vue
@@ -71,7 +71,7 @@ export default Vue.extend({
this.user = user;
this.fetching = false;
Progress.done();
- document.title = getUserName(this.user) + ' | Misskey';
+ document.title = getUserName(this.user) + ' | %i18n:common.name%';
});
},
diff --git a/src/client/app/desktop/views/components/notes.vue b/src/client/app/desktop/views/components/notes.vue
index c959508020..0ec2f16dbc 100644
--- a/src/client/app/desktop/views/components/notes.vue
+++ b/src/client/app/desktop/views/components/notes.vue
@@ -187,7 +187,7 @@ export default Vue.extend({
clearNotification() {
this.unreadCount = 0;
- document.title = 'Misskey';
+ document.title = '%i18n:common.name%';
},
onVisibilitychange() {
diff --git a/src/client/app/desktop/views/pages/home-customize.vue b/src/client/app/desktop/views/pages/home-customize.vue
index da5f15bb69..ffdcf39fe2 100644
--- a/src/client/app/desktop/views/pages/home-customize.vue
+++ b/src/client/app/desktop/views/pages/home-customize.vue
@@ -6,7 +6,7 @@
import Vue from 'vue';
export default Vue.extend({
mounted() {
- document.title = 'Misskey - %i18n:@title%';
+ document.title = '%i18n:common.name% - %i18n:@title%';
}
});
diff --git a/src/client/app/desktop/views/pages/home.vue b/src/client/app/desktop/views/pages/home.vue
index 60b257edb7..0c42e42bd2 100644
--- a/src/client/app/desktop/views/pages/home.vue
+++ b/src/client/app/desktop/views/pages/home.vue
@@ -16,7 +16,7 @@ export default Vue.extend({
}
},
mounted() {
- document.title = 'Misskey';
+ document.title = '%i18n:common.name%';
Progress.start();
},
diff --git a/src/client/app/desktop/views/pages/share.vue b/src/client/app/desktop/views/pages/share.vue
index b1317f93e5..f5f5c4e184 100644
--- a/src/client/app/desktop/views/pages/share.vue
+++ b/src/client/app/desktop/views/pages/share.vue
@@ -1,12 +1,12 @@
-
%i18n:@share-with%
+
{{'%i18n:@share-with%'.split("{}")[0] + '%i18n:common.name%' + '%i18n:@share-with%'.split("{}")[1]}}
-
+
diff --git a/src/client/app/desktop/views/pages/user/user.vue b/src/client/app/desktop/views/pages/user/user.vue
index 64a4eaa872..1a83f81342 100644
--- a/src/client/app/desktop/views/pages/user/user.vue
+++ b/src/client/app/desktop/views/pages/user/user.vue
@@ -68,7 +68,7 @@ export default Vue.extend({
this.user = user;
this.fetching = false;
Progress.done();
- document.title = getUserName(this.user) + ' | Misskey';
+ document.title = getUserName(this.user) + ' | %i18n:common.name%';
});
},
diff --git a/src/client/app/desktop/views/pages/welcome.vue b/src/client/app/desktop/views/pages/welcome.vue
index 7449a3e5a4..9543a55b9a 100644
--- a/src/client/app/desktop/views/pages/welcome.vue
+++ b/src/client/app/desktop/views/pages/welcome.vue
@@ -17,7 +17,7 @@
-
+