diff --git a/src/config/locales/de/translation.json b/src/config/locales/de/translation.json index c6b46058..a1cf0ab5 100644 --- a/src/config/locales/de/translation.json +++ b/src/config/locales/de/translation.json @@ -42,6 +42,7 @@ "profile": "Profil", "show_profile": "Profil ansehen", "edit_profile": "Profil bearbeiten", + "settings": "Settings", "collapse": "Zusammenbruch", "expand": "Erweitern", "home": "Home", @@ -71,10 +72,9 @@ "new_toot": "Toot", "reload": "Neu laden" }, - "preferences": { - "title": "Einstellungen", + "settings": { "general": { - "title": "Allgemein", + "title": "Settings", "toot": { "title": "Toot", "description": "Customize default visibility of toot.", @@ -85,7 +85,13 @@ "private": "Privat", "direct": "Direkt" } - }, + } + } + }, + "preferences": { + "title": "Einstellungen", + "general": { + "title": "Allgemein", "sounds": { "title": "Klänge", "description": "Please set feedback sounds.", diff --git a/src/config/locales/en/translation.json b/src/config/locales/en/translation.json index 4dbb0ac2..6a932df3 100644 --- a/src/config/locales/en/translation.json +++ b/src/config/locales/en/translation.json @@ -42,6 +42,7 @@ "profile": "Profile", "show_profile": "Show profile", "edit_profile": "Edit profile", + "settings": "Settings", "collapse": "Collapse", "expand": "Expand", "home": "Home", @@ -71,8 +72,8 @@ "new_toot": "Toot", "reload": "Reload" }, - "preferences": { - "title": "Preferences", + "settings": { + "title": "Settings", "general": { "title": "General", "toot": { @@ -85,7 +86,13 @@ "private": "Private", "direct": "Direct" } - }, + } + } + }, + "preferences": { + "title": "Preferences", + "general": { + "title": "General", "sounds": { "title": "Sounds", "description": "Please set feedback sounds.", diff --git a/src/config/locales/fr/translation.json b/src/config/locales/fr/translation.json index 359ccabe..a3e62098 100644 --- a/src/config/locales/fr/translation.json +++ b/src/config/locales/fr/translation.json @@ -42,6 +42,7 @@ "profile": "Profil", "show_profile": "Voir le profil", "edit_profile": "Éditer mon profil", + "settings": "Settings", "collapse": "Effondrer", "expand": "Développer", "home": "Accueil", @@ -71,8 +72,8 @@ "new_toot": "Pouet", "reload": "Recharger" }, - "preferences": { - "title": "Préférences", + "settings": { + "title": "Settings", "general": { "title": "Général", "toot": { @@ -85,7 +86,13 @@ "private": "Abonné⋅e⋅s uniquement", "direct": "Message direct" } - }, + } + } + }, + "preferences": { + "title": "Préférences", + "general": { + "title": "Général", "sounds": { "title": "Sons", "description": "Please set feedback sounds.", diff --git a/src/config/locales/ja/translation.json b/src/config/locales/ja/translation.json index 9d22738b..9c207f34 100644 --- a/src/config/locales/ja/translation.json +++ b/src/config/locales/ja/translation.json @@ -42,6 +42,7 @@ "profile": "プロフィール", "show_profile": "プロフィール確認", "edit_profile": "プロフィール編集", + "settings": "設定", "collapse": "縮小", "expand": "拡大", "home": "ホーム", @@ -71,10 +72,9 @@ "new_toot": "トゥート", "reload": "再読み込み" }, - "preferences": { + "settings": { "title": "設定", "general": { - "title": "一般", "toot": { "title": "トゥート", "description": "トゥートの公開設定を変更できます", @@ -85,7 +85,13 @@ "private": "フォロワー限定", "direct": "ダイレクト" } - }, + } + } + }, + "preferences": { + "title": "設定", + "general": { + "title": "一般", "sounds": { "title": "効果音", "description": "操作時の効果音を設定", diff --git a/src/config/locales/ko/translation.json b/src/config/locales/ko/translation.json index be71a7aa..60e04529 100644 --- a/src/config/locales/ko/translation.json +++ b/src/config/locales/ko/translation.json @@ -42,6 +42,7 @@ "profile": "프로필", "show_profile": "프로필 보기", "edit_profile": "프로필 수정", + "settings": "Settings", "collapse": "접기", "expand": "펼치기", "home": "홈", @@ -71,8 +72,8 @@ "new_toot": "툿", "reload": "새로고침" }, - "preferences": { - "title": "설정", + "settings": { + "title": "Settings", "general": { "title": "일반", "toot": { @@ -85,7 +86,13 @@ "private": "비공개", "direct": "다이렉트" } - }, + } + } + }, + "preferences": { + "title": "설정", + "general": { + "title": "일반", "sounds": { "title": "사운드", "description": "피드백 소리를 설정해 주세요.", diff --git a/src/config/locales/pl/translation.json b/src/config/locales/pl/translation.json index de79fc5c..751ebff5 100644 --- a/src/config/locales/pl/translation.json +++ b/src/config/locales/pl/translation.json @@ -42,6 +42,7 @@ "profile": "Profil", "show_profile": "Pokaż profil", "edit_profile": "Edytuj profil", + "settings": "Settings", "collapse": "Zawalić się", "expand": "Rozszerzać", "home": "Strona główna", @@ -71,8 +72,8 @@ "new_toot": "Wpisy", "reload": "Przeładować" }, - "preferences": { - "title": "Preferencje", + "settings": { + "title": "Settings", "general": { "title": "Ogólne", "toot": { @@ -85,7 +86,13 @@ "private": "Prywatne", "direct": "Bezpośrednie" } - }, + } + } + }, + "preferences": { + "title": "Preferencje", + "general": { + "title": "Ogólne", "sounds": { "title": "Dźwięki", "description": "Please set feedback sounds.", diff --git a/src/constants/visibility.js b/src/constants/visibility.js index d73fd460..ba977f18 100644 --- a/src/constants/visibility.js +++ b/src/constants/visibility.js @@ -1,21 +1,21 @@ export default { Public: { - name: 'preferences.general.toot.visibility.public', + name: 'settings.general.toot.visibility.public', value: 0, key: 'public' }, Unlisted: { - name: 'preferences.general.toot.visibility.unlisted', + name: 'settings.general.toot.visibility.unlisted', value: 1, key: 'unlisted' }, Private: { - name: 'preferences.general.toot.visibility.private', + name: 'settings.general.toot.visibility.private', value: 2, key: 'private' }, Direct: { - name: 'preferences.general.toot.visibility.direct', + name: 'settings.general.toot.visibility.direct', value: 3, key: 'direct' } diff --git a/src/main/preferences.js b/src/main/preferences.js index b40eb6e2..62f83cf8 100644 --- a/src/main/preferences.js +++ b/src/main/preferences.js @@ -1,6 +1,5 @@ import storage from 'electron-json-storage' import objectAssignDeep from 'object-assign-deep' -import Visibility from '../constants/visibility' import DisplayStyle from '../constants/displayStyle' import Theme from '../constants/theme' import Language from '../constants/language' @@ -13,8 +12,7 @@ const Base = { sound: { fav_rb: true, toot: true - }, - tootVisibility: Visibility.Public.value + } }, state: { collapse: false, diff --git a/src/renderer/components/GlobalHeader.vue b/src/renderer/components/GlobalHeader.vue index 400c0c69..3b9d86b5 100644 --- a/src/renderer/components/GlobalHeader.vue +++ b/src/renderer/components/GlobalHeader.vue @@ -74,6 +74,7 @@ export default { left: 0; width: 65px; padding-top: 24px; + border: 0; .el-tooltip { outline: 0; diff --git a/src/renderer/components/Preferences/General.vue b/src/renderer/components/Preferences/General.vue index 60ec59d7..005e6728 100644 --- a/src/renderer/components/Preferences/General.vue +++ b/src/renderer/components/Preferences/General.vue @@ -1,18 +1,6 @@