diff --git a/locales/index.d.ts b/locales/index.d.ts index f3a017a410..1f1b8e689f 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -5517,6 +5517,10 @@ export interface Locale extends ILocale { * セーフモードが有効な間はデフォルトのテーマが使用されます。セーフモードをオフにすると元に戻ります。 */ "themeIsDefaultBecauseSafeMode": string; + /** + * お使いのアカウントにはノートを投稿する権限がありません。 + */ + "youAreNotAllowedToCreateNote": string; "_order": { /** * 新しい順 diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 293d479e95..0d48dbc7b3 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1374,6 +1374,7 @@ safeModeEnabled: "セーフモードが有効です" pluginsAreDisabledBecauseSafeMode: "セーフモードが有効なため、プラグインはすべて無効化されています。" customCssIsDisabledBecauseSafeMode: "セーフモードが有効なため、カスタムCSSは適用されていません。" themeIsDefaultBecauseSafeMode: "セーフモードが有効な間はデフォルトのテーマが使用されます。セーフモードをオフにすると元に戻ります。" +youAreNotAllowedToCreateNote: "お使いのアカウントにはノートを投稿する権限がありません。" _order: newest: "新しい順" diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index 9200f48d99..8e8133d9b1 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -61,7 +61,8 @@ SPDX-License-Identifier: AGPL-3.0-only - {{ i18n.ts.notSpecifiedMentionWarning }} - + {{ i18n.ts.youAreNotAllowedToCreateNote }} + {{ i18n.ts.notSpecifiedMentionWarning }} -
{{ maxCwTextLength - cwTextLength }}
@@ -192,7 +193,7 @@ watch(showPreview, () => store.set('showPreview', showPreview.value)); const showAddMfmFunction = ref(prefer.s.enableQuickAddMfmFunction); watch(showAddMfmFunction, () => prefer.commit('enableQuickAddMfmFunction', showAddMfmFunction.value)); const cw = ref(props.initialCw ?? null); -const localOnly = ref($i.policies.canFederateNote ? props.initialLocalOnly ?? (prefer.s.rememberNoteVisibility ? store.s.localOnly : prefer.s.defaultNoteLocalOnly) : true); +const localOnly = ref(props.initialLocalOnly ?? (prefer.s.rememberNoteVisibility ? store.s.localOnly : prefer.s.defaultNoteLocalOnly)); const visibility = ref(props.initialVisibility ?? (prefer.s.rememberNoteVisibility ? store.s.visibility : prefer.s.defaultNoteVisibility)); const visibleUsers = ref([]); if (props.initialVisibleUsers) { @@ -283,7 +284,7 @@ const canPost = computed((): boolean => { const isNotMock = !props.mock; const canNote = $i.policies.canNote; - const canQuote = renoteTargetNote.value ? $i.policies.canQuote : true; + const canQuote = renoteTargetNote.value ? $i.policies.renotePolicy === 'allow' : true; const isNotPosting = !posting.value && !posted.value; const isNotUploading = !uploader.uploading.value; @@ -1522,7 +1523,7 @@ html[data-color-scheme=light] .preview { background: light-dark(rgba(0, 0, 0, 0.1), rgba(255, 255, 255, 0.1)); } -.hasNotSpecifiedMentions { +.formWarn { margin: 0 20px 16px 20px; } diff --git a/packages/frontend/src/pages/admin/roles.editor.vue b/packages/frontend/src/pages/admin/roles.editor.vue index 86ff29fc33..c21372dd4a 100644 --- a/packages/frontend/src/pages/admin/roles.editor.vue +++ b/packages/frontend/src/pages/admin/roles.editor.vue @@ -189,7 +189,7 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/pages/admin/roles.vue b/packages/frontend/src/pages/admin/roles.vue index 0652bf32b9..898ae54ddf 100644 --- a/packages/frontend/src/pages/admin/roles.vue +++ b/packages/frontend/src/pages/admin/roles.vue @@ -59,7 +59,7 @@ SPDX-License-Identifier: AGPL-3.0-only - +