Separate notifications preferences from general preferences (#4447)
* Separate notifications preferences from general preferences * Refine settings/notifications/show * remove preferences.notifications
This commit is contained in:
committed by
Eugen Rochko
parent
0e1b0f2747
commit
178f718a9b
@ -319,7 +319,6 @@ de:
|
||||
truncate: "…"
|
||||
preferences:
|
||||
languages: Sprachen
|
||||
notifications: Benachrichtigungen
|
||||
other: Weiteres
|
||||
publishing: Beiträge
|
||||
web: Web
|
||||
@ -390,6 +389,7 @@ de:
|
||||
export: Datenexport
|
||||
followers: Autorisierte Folgende
|
||||
import: Datenimport
|
||||
notifications: Benachrichtigungen
|
||||
preferences: Einstellungen
|
||||
settings: Einstellungen
|
||||
two_factor_authentication: Zwei-Faktor-Authentisierung
|
||||
|
@ -395,7 +395,6 @@ en:
|
||||
truncate: "…"
|
||||
preferences:
|
||||
languages: Languages
|
||||
notifications: Notifications
|
||||
other: Other
|
||||
publishing: Publishing
|
||||
web: Web
|
||||
@ -466,6 +465,7 @@ en:
|
||||
export: Data export
|
||||
followers: Authorized followers
|
||||
import: Import
|
||||
notifications: Notifications
|
||||
preferences: Preferences
|
||||
settings: Settings
|
||||
two_factor_authentication: Two-factor Authentication
|
||||
|
@ -395,7 +395,6 @@ ja:
|
||||
truncate: "…"
|
||||
preferences:
|
||||
languages: 言語
|
||||
notifications: 通知
|
||||
other: その他
|
||||
publishing: 投稿
|
||||
web: ウェブ
|
||||
@ -466,6 +465,7 @@ ja:
|
||||
export: データのエクスポート
|
||||
followers: 信頼済みのインスタンス
|
||||
import: データのインポート
|
||||
notifications: 通知
|
||||
preferences: ユーザー設定
|
||||
settings: 設定
|
||||
two_factor_authentication: 二段階認証
|
||||
|
@ -393,7 +393,6 @@ ko:
|
||||
truncate: "…"
|
||||
preferences:
|
||||
languages: 언어
|
||||
notifications: 알림
|
||||
other: 기타
|
||||
publishing: 퍼블리싱
|
||||
web: 웹
|
||||
@ -464,6 +463,7 @@ ko:
|
||||
export: 데이터 내보내기
|
||||
followers: 신뢰 중인 인스턴스
|
||||
import: 데이터 가져오기
|
||||
notifications: 알림
|
||||
preferences: 사용자 설정
|
||||
settings: 설정
|
||||
two_factor_authentication: 2단계 인증
|
||||
|
@ -473,7 +473,6 @@ oc:
|
||||
truncate: "…"
|
||||
preferences:
|
||||
languages: Lengas
|
||||
notifications: Notificacions
|
||||
other: Autre
|
||||
publishing: Publicar
|
||||
web: Interfàcia Web
|
||||
@ -544,6 +543,7 @@ oc:
|
||||
export: Export donadas
|
||||
followers: Seguidors autorizats
|
||||
import: Importar
|
||||
notifications: Notificacions
|
||||
preferences: Preferéncias
|
||||
settings: Paramètres
|
||||
two_factor_authentication: Autentificacion en dos temps
|
||||
|
@ -396,7 +396,6 @@ pl:
|
||||
truncate: "…"
|
||||
preferences:
|
||||
languages: Języki
|
||||
notifications: Powiadomienia
|
||||
other: Pozostałe
|
||||
publishing: Publikowanie
|
||||
web: Sieć
|
||||
@ -467,6 +466,7 @@ pl:
|
||||
export: Eksportowanie danych
|
||||
followers: Autoryzowani śledzący
|
||||
import: Importowanie danych
|
||||
notifications: Powiadomienia
|
||||
preferences: Preferencje
|
||||
settings: Ustawienia
|
||||
two_factor_authentication: Uwierzytelnianie dwuetapowe
|
||||
|
@ -7,6 +7,7 @@ SimpleNavigation::Configuration.run do |navigation|
|
||||
primary.item :settings, safe_join([fa_icon('cog fw'), t('settings.settings')]), settings_profile_url do |settings|
|
||||
settings.item :profile, safe_join([fa_icon('user fw'), t('settings.edit_profile')]), settings_profile_url
|
||||
settings.item :preferences, safe_join([fa_icon('sliders fw'), t('settings.preferences')]), settings_preferences_url
|
||||
settings.item :notifications, safe_join([fa_icon('bell fw'), t('settings.notifications')]), settings_notifications_url
|
||||
settings.item :password, safe_join([fa_icon('lock fw'), t('auth.change_password')]), edit_user_registration_url, highlights_on: %r{/auth/edit|/settings/delete}
|
||||
settings.item :two_factor_authentication, safe_join([fa_icon('mobile fw'), t('settings.two_factor_authentication')]), settings_two_factor_authentication_url, highlights_on: %r{/settings/two_factor_authentication}
|
||||
settings.item :import, safe_join([fa_icon('cloud-upload fw'), t('settings.import')]), settings_import_url
|
||||
|
@ -67,6 +67,7 @@ Rails.application.routes.draw do
|
||||
namespace :settings do
|
||||
resource :profile, only: [:show, :update]
|
||||
resource :preferences, only: [:show, :update]
|
||||
resource :notifications, only: [:show, :update]
|
||||
resource :import, only: [:show, :create]
|
||||
|
||||
resource :export, only: [:show]
|
||||
|
Reference in New Issue
Block a user