From 357da2ce3ad9298cce68d3a2f453c5d0f58d0bb1 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 11 Mar 2022 12:44:35 +0900 Subject: [PATCH 01/12] =?UTF-8?q?fix(server):=20ulid=E3=82=92=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=E3=81=A8=E5=8B=95?= =?UTF-8?q?=E4=BD=9C=E3=81=97=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/backend/src/server/api/define.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend/src/server/api/define.ts b/packages/backend/src/server/api/define.ts index 9094fcffc6..4e6d041a29 100644 --- a/packages/backend/src/server/api/define.ts +++ b/packages/backend/src/server/api/define.ts @@ -31,7 +31,7 @@ const ajv = new Ajv({ useDefaults: true, }); -ajv.addFormat('misskey:id', /^[a-z0-9]+$/); +ajv.addFormat('misskey:id', /^[a-zA-Z0-9]+$/); export default function (meta: T, paramDef: Ps, cb: executor) : (params: any, user: T['requireCredential'] extends true ? SimpleUserInfo : SimpleUserInfo | null, token: AccessToken | null, file?: any) => Promise { From 5490d82e3bb2165086f758f59206136a88df6a12 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 11 Mar 2022 18:55:47 +0900 Subject: [PATCH 02/12] tweal c;iemy --- locales/ja-JP.yml | 2 +- packages/client/src/components/chart.vue | 32 +++++++++++++++++++ .../client/src/pages/user/index.activity.vue | 31 +++++++++++++++++- 3 files changed, 63 insertions(+), 2 deletions(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 13f9efe9b4..e2cf11b49d 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -830,7 +830,7 @@ auto: "自動" themeColor: "テーマカラー" size: "サイズ" numberOfColumn: "列の数" -searchByGoogle: "ググる" +searchByGoogle: "検索" instanceDefaultLightTheme: "インスタンスデフォルトのライトテーマ" instanceDefaultDarkTheme: "インスタンスデフォルトのダークテーマ" instanceDefaultThemeDescription: "オブジェクト形式のテーマコードを記入します。" diff --git a/packages/client/src/components/chart.vue b/packages/client/src/components/chart.vue index 13ca60efa8..a7870de39d 100644 --- a/packages/client/src/components/chart.vue +++ b/packages/client/src/components/chart.vue @@ -795,6 +795,36 @@ export default defineComponent({ }; }; + const fetchPerUserFollowingChart = async (): Promise => { + const raw = await os.api('charts/user/following', { userId: props.args.user.id, limit: props.limit, span: props.span }); + return { + series: [{ + name: 'Local', + type: 'area', + data: format(raw.local.followings.total), + }, { + name: 'Remote', + type: 'area', + data: format(raw.remote.followings.total), + }], + }; + }; + + const fetchPerUserFollowersChart = async (): Promise => { + const raw = await os.api('charts/user/following', { userId: props.args.user.id, limit: props.limit, span: props.span }); + return { + series: [{ + name: 'Local', + type: 'area', + data: format(raw.local.followers.total), + }, { + name: 'Remote', + type: 'area', + data: format(raw.remote.followers.total), + }], + }; + }; + const fetchPerUserDriveChart = async (): Promise => { const raw = await os.api('charts/user/drive', { userId: props.args.user.id, limit: props.limit, span: props.span }); return { @@ -838,6 +868,8 @@ export default defineComponent({ case 'instance-drive-files-total': return fetchInstanceDriveFilesChart(true); case 'per-user-notes': return fetchPerUserNotesChart(); + case 'per-user-following': return fetchPerUserFollowingChart(); + case 'per-user-followers': return fetchPerUserFollowersChart(); case 'per-user-drive': return fetchPerUserDriveChart(); } }; diff --git a/packages/client/src/pages/user/index.activity.vue b/packages/client/src/pages/user/index.activity.vue index f64e9d5b60..aecd25d6b0 100644 --- a/packages/client/src/pages/user/index.activity.vue +++ b/packages/client/src/pages/user/index.activity.vue @@ -1,9 +1,14 @@ @@ -13,6 +18,8 @@ import { } from 'vue'; import * as misskey from 'misskey-js'; import MkContainer from '@/components/ui/container.vue'; import MkChart from '@/components/chart.vue'; +import * as os from '@/os'; +import { i18n } from '@/i18n'; const props = withDefaults(defineProps<{ user: misskey.entities.User; @@ -20,4 +27,26 @@ const props = withDefaults(defineProps<{ }>(), { limit: 50, }); + +let chartSrc = $ref('per-user-notes'); + +function showMenu(ev: MouseEvent) { + os.popupMenu([{ + text: i18n.ts.notes, + active: true, + action: () => { + chartSrc = 'per-user-notes'; + } + }/*, { + text: i18n.ts.following, + action: () => { + chartSrc = 'per-user-following'; + } + }, { + text: i18n.ts.followers, + action: () => { + chartSrc = 'per-user-followers'; + } + }*/], ev.currentTarget ?? ev.target); +} From 0a6c9a00bd9b2590fa6b886deaeecf79394e7231 Mon Sep 17 00:00:00 2001 From: xianon Date: Sat, 12 Mar 2022 13:21:04 +0900 Subject: [PATCH 03/12] =?UTF-8?q?=E3=83=AA=E3=83=AC=E3=83=BC=E3=81=8C?= =?UTF-8?q?=E5=8B=95=E4=BD=9C=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E3=81=99=E3=82=8B=20(#8396)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/backend/src/remote/activitypub/misc/ld-signature.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend/src/remote/activitypub/misc/ld-signature.ts b/packages/backend/src/remote/activitypub/misc/ld-signature.ts index 34294c935d..5132c6ef96 100644 --- a/packages/backend/src/remote/activitypub/misc/ld-signature.ts +++ b/packages/backend/src/remote/activitypub/misc/ld-signature.ts @@ -1,5 +1,5 @@ import * as crypto from 'node:crypto'; -import * as jsonld from 'jsonld'; +import jsonld from 'jsonld'; import { CONTEXTS } from './contexts.js'; import fetch from 'node-fetch'; import { httpAgent, httpsAgent } from '@/misc/fetch.js'; From c76d14b881a54346b4296e33e65f24f5ebbeb397 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Mar 2022 13:22:50 +0900 Subject: [PATCH 04/12] Update CHANGELOG.md --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f9d09546b..1547763605 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,15 @@ You should also include the user name that made the change. --> +## 12.x.x (unreleased) + +### Improvements +- + +### Bugfixes +- リレーが動作しない問題を修正 @xianonn +- ulidを使用していると動作しない問題を修正 @syuilo + ## 12.108.0 (2022/03/09) ### NOTE From fb355abbcf268d3fdedeb4ebe7c513d70dc066e5 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Mar 2022 14:54:08 +0900 Subject: [PATCH 05/12] :art: --- packages/client/src/components/chart.vue | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/client/src/components/chart.vue b/packages/client/src/components/chart.vue index a7870de39d..cc1aa9c20a 100644 --- a/packages/client/src/components/chart.vue +++ b/packages/client/src/components/chart.vue @@ -71,7 +71,7 @@ const colors = { purple: '#e300db', orange: '#fe6919', lime: '#bde800', - cyan: '#00efef', + cyan: '#00e0e0', }; const colorSets = [colors.blue, colors.green, colors.yellow, colors.red, colors.purple]; const getColor = (i) => { @@ -127,7 +127,7 @@ export default defineComponent({ name: string; type: 'line' | 'area'; color?: string; - borderDash?: number[]; + dashed?: boolean; hidden?: boolean; data: { x: number; @@ -217,7 +217,7 @@ export default defineComponent({ pointRadius: 0, borderWidth: props.bar ? 0 : 2, borderColor: x.color ? x.color : getColor(i), - borderDash: x.borderDash || [], + borderDash: x.dashed ? [5, 5] : [], borderJoinStyle: 'round', borderRadius: props.bar ? 3 : undefined, backgroundColor: props.bar ? (x.color ? x.color : getColor(i)) : alpha(x.color ? x.color : getColor(i), 0.1), @@ -226,7 +226,7 @@ export default defineComponent({ axis: 'y', colors: { 0: alpha(x.color ? x.color : getColor(i), 0), - [maxes[i]]: alpha(x.color ? x.color : getColor(i), 0.175), + [maxes[i]]: alpha(x.color ? x.color : getColor(i), 0.2), }, }, }, @@ -403,16 +403,19 @@ export default defineComponent({ name: 'Pub & Sub', type: 'line', data: format(raw.pubsub), + dashed: true, color: colors.cyan, }, { name: 'Pub', type: 'line', data: format(raw.pub), + dashed: true, color: colors.purple, }, { name: 'Sub', type: 'line', data: format(raw.sub), + dashed: true, color: colors.orange, }], }; @@ -593,7 +596,7 @@ export default defineComponent({ series: [{ name: 'All', type: 'line', - borderDash: [5, 5], + dashed: true, data: format( sum( raw.local.incSize, @@ -628,7 +631,7 @@ export default defineComponent({ series: [{ name: 'All', type: 'line', - borderDash: [5, 5], + dashed: true, data: format( sum( raw.local.incCount, From d1d68c01243f8e0e748e729a91a3163de6bd0754 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Mar 2022 15:13:11 +0900 Subject: [PATCH 06/12] fix(server): dummy image is not served correctly Fix #8393 --- packages/backend/src/server/file/send-drive-file.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend/src/server/file/send-drive-file.ts b/packages/backend/src/server/file/send-drive-file.ts index 4e2bba0e20..6bc220b362 100644 --- a/packages/backend/src/server/file/send-drive-file.ts +++ b/packages/backend/src/server/file/send-drive-file.ts @@ -2,7 +2,7 @@ import * as fs from 'node:fs'; import { fileURLToPath } from 'node:url'; import { dirname } from 'node:path'; import Koa from 'koa'; -import * as send from 'koa-send'; +import send from 'koa-send'; import rename from 'rename'; import * as tmp from 'tmp'; import { serverLogger } from '../index.js'; From 19ff9a3b4dd38b7bd02c7d95c0cbe993826e6020 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Mar 2022 15:21:07 +0900 Subject: [PATCH 07/12] =?UTF-8?q?fix(server):=20HTML=E3=81=8C=E6=AD=A3?= =?UTF-8?q?=E3=81=97=E3=81=8F=E3=83=AC=E3=83=B3=E3=83=80=E3=83=AA=E3=83=B3?= =?UTF-8?q?=E3=82=B0=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix #8392 --- packages/backend/package.json | 2 +- packages/backend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/backend/package.json b/packages/backend/package.json index f775a99a55..87712faf7c 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -19,7 +19,7 @@ "@elastic/elasticsearch": "7.11.0", "@koa/cors": "3.1.0", "@koa/multer": "3.0.0", - "@koa/router": "10.1.1", + "@koa/router": "9.0.1", "@sinonjs/fake-timers": "9.1.1", "@syuilo/aiscript": "0.11.1", "@types/bcryptjs": "2.4.2", diff --git a/packages/backend/yarn.lock b/packages/backend/yarn.lock index c5b1237721..67a02742d4 100644 --- a/packages/backend/yarn.lock +++ b/packages/backend/yarn.lock @@ -128,10 +128,10 @@ resolved "https://registry.yarnpkg.com/@koa/multer/-/multer-3.0.0.tgz#439777949f28097d7b329c0b4ce3048074c862f8" integrity sha512-y+OQBmex5D1jIl723gAEUYcAWPEicIXppaAKw/zCMfpllQ08ZNweDPwoCLxEoatqd5pCu2XG6V8dl67JRq3RJw== -"@koa/router@10.1.1": - version "10.1.1" - resolved "https://registry.yarnpkg.com/@koa/router/-/router-10.1.1.tgz#8e5a85c9b243e0bc776802c0de564561e57a5f78" - integrity sha512-ORNjq5z4EmQPriKbR0ER3k4Gh7YGNhWDL7JBW+8wXDrHLbWYKYSJaOJ9aN06npF5tbTxe2JBOsurpJDAvjiXKw== +"@koa/router@9.0.1": + version "9.0.1" + resolved "https://registry.yarnpkg.com/@koa/router/-/router-9.0.1.tgz#4090a14223ea7e78aa13b632761209cba69acd95" + integrity sha512-OI+OU49CJV4px0WkIMmayBeqVXB/JS1ZMq7UoGlTZt6Y7ijK7kdeQ18+SEHHJPytmtI1y6Hf8XLrpxva3mhv5Q== dependencies: debug "^4.1.1" http-errors "^1.7.3" From 6cf346b3ea4530fedcff7395b58a79265fe89588 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Mar 2022 15:22:05 +0900 Subject: [PATCH 08/12] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1547763605..f54820bb87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ You should also include the user name that made the change. ### Bugfixes - リレーが動作しない問題を修正 @xianonn - ulidを使用していると動作しない問題を修正 @syuilo +- 外部からOGPが正しく取得できない問題を修正 @syuilo ## 12.108.0 (2022/03/09) From db900c8324d16921579cda18633120b87d1fe7f5 Mon Sep 17 00:00:00 2001 From: dogcraft Date: Sat, 12 Mar 2022 18:23:57 +0800 Subject: [PATCH 09/12] Fix bug : "IPCIDR is not a constructor" (#8400) --- packages/backend/src/misc/download-url.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend/src/misc/download-url.ts b/packages/backend/src/misc/download-url.ts index 21eee57b33..7c57b140ef 100644 --- a/packages/backend/src/misc/download-url.ts +++ b/packages/backend/src/misc/download-url.ts @@ -6,7 +6,7 @@ import { httpAgent, httpsAgent, StatusError } from './fetch.js'; import config from '@/config/index.js'; import chalk from 'chalk'; import Logger from '@/services/logger.js'; -import * as IPCIDR from 'ip-cidr'; +import IPCIDR from 'ip-cidr'; import PrivateIp from 'private-ip'; const pipeline = util.promisify(stream.pipeline); From a2094054a353f04b296eba01b12dbb3920f228ea Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Mar 2022 19:27:14 +0900 Subject: [PATCH 10/12] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f54820bb87..f9dee17a31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ You should also include the user name that made the change. - リレーが動作しない問題を修正 @xianonn - ulidを使用していると動作しない問題を修正 @syuilo - 外部からOGPが正しく取得できない問題を修正 @syuilo +- instance can not get the files from other instance when there are items in allowedPrivateNetworks in .config/default.yml @ybw2016v ## 12.108.0 (2022/03/09) From cf58a42185f61fa97361efa0df1633364828a9fc Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Mar 2022 19:34:43 +0900 Subject: [PATCH 11/12] New Crowdin updates (#8398) * New translations ja-JP.yml (Catalan) * New translations ja-JP.yml (Turkish) * New translations ja-JP.yml (Japanese, Kansai) * New translations ja-JP.yml (Kabyle) * New translations ja-JP.yml (Kannada) * New translations ja-JP.yml (Uyghur) * New translations ja-JP.yml (Indonesian) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Dutch) * New translations ja-JP.yml (Czech) * New translations ja-JP.yml (Italian) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Polish) * New translations ja-JP.yml (Portuguese) * New translations ja-JP.yml (Russian) * New translations ja-JP.yml (Ukrainian) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Romanian) --- locales/ca-ES.yml | 1 + locales/cs-CZ.yml | 1 + locales/es-ES.yml | 1 + locales/id-ID.yml | 1 + locales/it-IT.yml | 1 + locales/ja-KS.yml | 1 + locales/kab-KAB.yml | 1 + locales/kn-IN.yml | 1 + locales/ko-KR.yml | 1 + locales/nl-NL.yml | 1 + locales/pl-PL.yml | 1 + locales/pt-PT.yml | 1 + locales/ro-RO.yml | 1 + locales/ru-RU.yml | 1 + locales/tr-TR.yml | 1 + locales/ug-CN.yml | 1 + locales/uk-UA.yml | 1 + locales/zh-TW.yml | 1 + 18 files changed, 18 insertions(+) diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml index 93c50c72e5..5f74cb6bef 100644 --- a/locales/ca-ES.yml +++ b/locales/ca-ES.yml @@ -12,6 +12,7 @@ gotIt: "Ho he entès!" cancel: "Cancel·lar" smtpUser: "Nom d'usuari" smtpPass: "Contrasenya" +searchByGoogle: "Cercar" _mfm: search: "Cercar" _sfx: diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml index dcbbfcab82..2f5e375372 100644 --- a/locales/cs-CZ.yml +++ b/locales/cs-CZ.yml @@ -449,6 +449,7 @@ clearCache: "Vyprázdnit mezipaměť" info: "Informace" user: "Uživatelé" administration: "Administrace" +searchByGoogle: "Vyhledávání" _email: _follow: title: "Máte nového následovníka" diff --git a/locales/es-ES.yml b/locales/es-ES.yml index d0fc254ef4..fd69f62ff5 100644 --- a/locales/es-ES.yml +++ b/locales/es-ES.yml @@ -762,6 +762,7 @@ muteThread: "Ocultar hilo" unmuteThread: "Mostrar hilo" ffVisibility: "Visibilidad de seguidores y seguidos" hide: "Ocultar" +searchByGoogle: "Buscar" indefinitely: "Sin límite de tiempo" _ffVisibility: public: "Publicar" diff --git a/locales/id-ID.yml b/locales/id-ID.yml index 03970c5f25..cf89158676 100644 --- a/locales/id-ID.yml +++ b/locales/id-ID.yml @@ -825,6 +825,7 @@ overridedDeviceKind: "Tipe perangkat" smartphone: "Ponsel" tablet: "Tablet" auto: "Otomatis" +searchByGoogle: "Penelusuran" indefinitely: "Selamanya" _emailUnavailable: used: "Alamat surel ini telah digunakan" diff --git a/locales/it-IT.yml b/locales/it-IT.yml index 8601f93074..1eaa78b646 100644 --- a/locales/it-IT.yml +++ b/locales/it-IT.yml @@ -802,6 +802,7 @@ leaveGroupConfirm: "Uscire da「{name}」?" useDrawerReactionPickerForMobile: "Mostra sul drawer da dispositivo mobile" welcomeBackWithName: "Bentornato/a, {name}" clickToFinishEmailVerification: "Fai click su [{ok}] per completare la verifica dell'indirizzo email." +searchByGoogle: "Cerca" indefinitely: "Non scade" _emailUnavailable: used: "Email già in uso" diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml index 382d9c49c8..52ecd8c24e 100644 --- a/locales/ja-KS.yml +++ b/locales/ja-KS.yml @@ -655,6 +655,7 @@ global: "グローバル" sent: "送信" hashtags: "ハッシュタグ" hide: "隠す" +searchByGoogle: "探す" indefinitely: "無期限" _ad: back: "戻る" diff --git a/locales/kab-KAB.yml b/locales/kab-KAB.yml index 364a935310..6a14cbe1ba 100644 --- a/locales/kab-KAB.yml +++ b/locales/kab-KAB.yml @@ -55,6 +55,7 @@ accountInfo: "Talɣut n umiḍan" emailNotification: "Ilɣa imayl" selectAccount: "Fren amiḍan" accounts: "Imiḍan" +searchByGoogle: "Nadi" _email: _follow: title: "Yeṭṭafaṛ-ik·em-id" diff --git a/locales/kn-IN.yml b/locales/kn-IN.yml index fd52842b2c..3111c90dd5 100644 --- a/locales/kn-IN.yml +++ b/locales/kn-IN.yml @@ -59,6 +59,7 @@ remove: "ಅಳಿಸು" smtpUser: "ಬಳಕೆಹೆಸರು" smtpPass: "ಗುಪ್ತಪದ" user: "ಬಳಕೆದಾರ" +searchByGoogle: "ಹುಡುಕು" _email: _follow: title: "ಹಿಂಬಾಲಿಸಿದರು" diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index 39522e8d7d..e1ad77cbc9 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -825,6 +825,7 @@ overridedDeviceKind: "장치 유형" smartphone: "스마트폰" tablet: "태블릿" auto: "자동" +searchByGoogle: "검색" indefinitely: "무기한" _emailUnavailable: used: "이 메일 주소는 사용중입니다" diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml index 38f9a88af8..a00716fe05 100644 --- a/locales/nl-NL.yml +++ b/locales/nl-NL.yml @@ -256,6 +256,7 @@ user: "Gebruikers" muteThread: "Discussies dempen " unmuteThread: "Dempen van discussie ongedaan maken" hide: "Verbergen" +searchByGoogle: "Zoeken" _email: _follow: title: "volgde jou" diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml index 9f98332a67..78d86dd7e3 100644 --- a/locales/pl-PL.yml +++ b/locales/pl-PL.yml @@ -758,6 +758,7 @@ received: "Otrzymane" hashtags: "Hashtag" pubSub: "Konta Pub/Sub" hide: "Ukryj" +searchByGoogle: "Szukaj" indefinitely: "Nigdy" _ffVisibility: public: "Publikuj" diff --git a/locales/pt-PT.yml b/locales/pt-PT.yml index d095887bdc..0f12155e33 100644 --- a/locales/pt-PT.yml +++ b/locales/pt-PT.yml @@ -61,6 +61,7 @@ pinnedNotes: "Post fixado" smtpUser: "Nome de usuário" smtpPass: "Senha" user: "Usuários" +searchByGoogle: "Pesquisar" _email: _follow: title: "Você tem um novo seguidor" diff --git a/locales/ro-RO.yml b/locales/ro-RO.yml index 8ec9deb29e..7f8ed82b8d 100644 --- a/locales/ro-RO.yml +++ b/locales/ro-RO.yml @@ -477,6 +477,7 @@ smtpPass: "Parolă" clearCache: "Golește cache-ul" info: "Despre" user: "Utilizatori" +searchByGoogle: "Caută" _email: _follow: title: "te-a urmărit" diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml index 610fe727ec..877e1e185d 100644 --- a/locales/ru-RU.yml +++ b/locales/ru-RU.yml @@ -815,6 +815,7 @@ leaveGroupConfirm: "Покинуть группу «{name}»?" useDrawerReactionPickerForMobile: "Выдвижная палитра на мобильном устройстве" welcomeBackWithName: "С возвращением, {name}!" clickToFinishEmailVerification: "Пожалуйста, нажмите [{ok}], чтобы завершить подтверждение адреса электронной почты." +searchByGoogle: "Поиск" indefinitely: "вечно" _emailUnavailable: used: "Уже используется" diff --git a/locales/tr-TR.yml b/locales/tr-TR.yml index 46204d33c4..aecb413de7 100644 --- a/locales/tr-TR.yml +++ b/locales/tr-TR.yml @@ -47,6 +47,7 @@ remove: "Sil" smtpUser: "Kullanıcı Adı" smtpPass: "Şifre" user: "Kullanıcı" +searchByGoogle: "Arama" _mfm: search: "Arama" _sfx: diff --git a/locales/ug-CN.yml b/locales/ug-CN.yml index cfdecfbd4a..a7504542d0 100644 --- a/locales/ug-CN.yml +++ b/locales/ug-CN.yml @@ -1,5 +1,6 @@ --- _lang_: "ياپونچە" search: "ئىزدەش" +searchByGoogle: "ئىزدەش" _mfm: search: "ئىزدەش" diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml index 4dbc29766e..073b2c310e 100644 --- a/locales/uk-UA.yml +++ b/locales/uk-UA.yml @@ -685,6 +685,7 @@ global: "Глобальна" sent: "Відправити" hashtags: "Хештеґ" hide: "Сховати" +searchByGoogle: "Пошук" indefinitely: "Ніколи" _ad: back: "Назад" diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml index d169e8e613..a1e0a830cd 100644 --- a/locales/zh-TW.yml +++ b/locales/zh-TW.yml @@ -747,6 +747,7 @@ global: "公開" sent: "發送" hashtags: "#tag" hide: "隱藏" +searchByGoogle: "搜尋" indefinitely: "無期限" _ffVisibility: public: "發佈" From b81b66912d6a3d8d2e35c1e9a01790e0d77142fa Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Mar 2022 19:35:08 +0900 Subject: [PATCH 12/12] 12.108.1 --- CHANGELOG.md | 5 +---- package.json | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9dee17a31..188405268d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,10 +10,7 @@ You should also include the user name that made the change. --> -## 12.x.x (unreleased) - -### Improvements -- +## 12.108.1 (2022/03/12) ### Bugfixes - リレーが動作しない問題を修正 @xianonn diff --git a/package.json b/package.json index 1d22e1d129..65aa436cf3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "12.108.0", + "version": "12.108.1", "codename": "indigo", "repository": { "type": "git",