iv-org
/
invidious
mirror of https://github.com/iv-org/invidious.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1043 from makos/display-username 

Display username of currently logged in user
This commit is contained in:
syeopite 2021-06-19 05:28:30 -07:00 committed by GitHub
parent 00425670d7 90c907710c
commit 75d04a92c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 72 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
locales/ar.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "إعدادات المدير",
"Default homepage: ": "الصفحة الرئيسية الافتراضية ",
"Feed menu: ": "قائمة التدفقات: ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "تفعيل 'الأفضل' ؟ ",
"CAPTCHA enabled: ": "تفعيل الكابتشا: ",
"Login enabled: ": "تفعيل الولوج: ",

2
locales/de.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "Administrator-Einstellungen",
"Default homepage: ": "Standard-Startseite: ",
"Feed menu: ": "Feed-Menü: ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "Top aktiviert? ",
"CAPTCHA enabled: ": "CAPTCHA aktiviert? ",
"Login enabled: ": "Anmeldung aktiviert: ",

2
locales/el.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "Προτιμήσεις διαχειριστή",
"Default homepage: ": "Προεπιλεγμένη αρχική: ",
"Feed menu: ": "Μενού ροής συνδρομών: ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "Ενεργοποίηση κορυφαίων; ",
"CAPTCHA enabled: ": "Ενεργοποίηση CAPTCHA; ",
"Login enabled: ": "Ενεργοποίηση σύνδεσης; ",

2
locales/en-US.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "Administrator preferences",
"Default homepage: ": "Default homepage: ",
"Feed menu: ": "Feed menu: ",
"Show nickname on top: ": "Show nickname on top: ",
"Welcome, `x`": "Welcome, `x`",
"Top enabled: ": "Top enabled: ",
"CAPTCHA enabled: ": "CAPTCHA enabled: ",
"Login enabled: ": "Login enabled: ",

2
locales/eo.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "Agordoj de administranto",
"Default homepage: ": "Defaŭlta hejmpaĝo: ",
"Feed menu: ": "Flua menuo: ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "Ĉu pli bonaj ŝaltitaj? ",
"CAPTCHA enabled: ": "Ĉu CAPTCHA ŝaltita? ",
"Login enabled: ": "Ĉu ensaluto aktivita? ",

2
locales/es.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "Preferencias de administrador",
"Default homepage: ": "Página de inicio por defecto: ",
"Feed menu: ": "Menú de fuentes: ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "¿Habilitar los destacados? ",
"CAPTCHA enabled: ": "¿Habilitar los CAPTCHA? ",
"Login enabled: ": "¿Habilitar el inicio de sesión? ",

2
locales/fa.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "ترجیحات مدیریت",
"Default homepage: ": "صفحه خانه پیشفرض ",
"Feed menu: ": "منو خوراک: ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "بالا فعال شده: ",
"CAPTCHA enabled: ": "CAPTCHA فعال شده: ",
"Login enabled: ": "ورود فعال شده: ",

2
locales/fi.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "Järjestelmänvalvojan asetukset",
"Default homepage: ": "Oletuskotisivu: ",
"Feed menu: ": "Syötevalikko: ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "Yläosa käytössä: ",
"CAPTCHA enabled: ": "CAPTCHA käytössä: ",
"Login enabled: ": "Kirjautuminen käytössä: ",

2
locales/fr.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "Préferences d'Administration",
"Default homepage: ": "Page d'accueil par défaut : ",
"Feed menu: ": "Préferences des abonnements : ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "Top activé : ",
"CAPTCHA enabled: ": "CAPTCHA activé : ",
"Login enabled: ": "Autoriser l'ouverture de sessions utilisateur : ",

2
locales/he.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "הגדרות ניהול מערכת",
"Default homepage: ": "Default homepage: ",
"Feed menu: ": "תפריט ההזנה: ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "",
"CAPTCHA enabled: ": "",
"Login enabled: ": "",

2
locales/hr.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "Postavke administratora",
"Default homepage: ": "Standardna početna stranica: ",
"Feed menu: ": "Izbornik za feedove: ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "Najbolji aktivirani: ",
"CAPTCHA enabled: ": "Aktivirani CAPTCHA: ",
"Login enabled: ": "Prijava aktivirana: ",

2
locales/id.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "Preferensi administrator",
"Default homepage: ": "Laman beranda default: ",
"Feed menu: ": "Menu umpan: ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "Teratas diaktifkan: ",
"CAPTCHA enabled: ": "CAPTCHA diaktifkan: ",
"Login enabled: ": "Masuk diaktifkan: ",

2
locales/is.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "Kjörstillingar stjórnanda",
"Default homepage: ": "Sjálfgefin heimasíða: ",
"Feed menu: ": "Straum valmynd: ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "Toppur virkur? ",
"CAPTCHA enabled: ": "CAPTCHA virk? ",
"Login enabled: ": "Innskráning virk? ",

2
locales/it.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "Preferenze amministratore",
"Default homepage: ": "Pagina principale predefinita: ",
"Feed menu: ": "Menu iscrizioni: ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "Top abilitato: ",
"CAPTCHA enabled: ": "CAPTCHA attivati: ",
"Login enabled: ": "Accesso attivato: ",

2
locales/ja.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "管理者設定",
"Default homepage: ": "デフォルトのホーム: ",
"Feed menu: ": "フィードメニュー: ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "トップページを有効化: ",
"CAPTCHA enabled: ": "CAPTCHA を有効化: ",
"Login enabled: ": "ログインを有効化: ",

2
locales/nb-NO.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "Administratorinnstillinger",
"Default homepage: ": "Forvalgt hjemmeside: ",
"Feed menu: ": "Kilde-meny: ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "Topp påskrudd? ",
"CAPTCHA enabled: ": "CAPTCHA påskrudd? ",
"Login enabled: ": "Innlogging påskrudd? ",

2
locales/nl.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "Beheerdersinstellingen",
"Default homepage: ": "Standaard startpagina: ",
"Feed menu: ": "Feedmenu: ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "Bovenkant inschakelen? ",
"CAPTCHA enabled: ": "CAPTCHA gebruiken? ",
"Login enabled: ": "Inloggen toestaan? ",

2
locales/pl.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "Preferencje administratora",
"Default homepage: ": "Domyślna strona główna: ",
"Feed menu: ": "Menu aktualności: ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "\"Top\" aktywne: ",
"CAPTCHA enabled: ": "CAPTCHA aktywna? ",
"Login enabled: ": "Logowanie włączone? ",

2
locales/pt-BR.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "Preferências de administrador",
"Default homepage: ": "Página de início padrão: ",
"Feed menu: ": "Menu do feed: ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "Habilitar destaques: ",
"CAPTCHA enabled: ": "Habilitar CAPTCHA: ",
"Login enabled: ": "Habilitar login: ",

2
locales/pt-PT.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "Preferências de administrador",
"Default homepage: ": "Página inicial predefinida: ",
"Feed menu: ": "Menu de subscrições: ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "Top ativado: ",
"CAPTCHA enabled: ": "CAPTCHA ativado: ",
"Login enabled: ": "Iniciar sessão ativado: ",

2
locales/ro.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "Preferințele Administratorului",
"Default homepage: ": "Pagina principală implicită: ",
"Feed menu: ": "Preferințe legate de pagina de abonamente: ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "Top activat: ",
"CAPTCHA enabled: ": "CAPTCHA activat : ",
"Login enabled: ": "Autentificare activată : ",

2
locales/ru.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "Администраторские настройки",
"Default homepage: ": "Главная страница по умолчанию: ",
"Feed menu: ": "Меню ленты видео: ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "Включить топ видео? ",
"CAPTCHA enabled: ": "Включить капчу? ",
"Login enabled: ": "Включить авторизацию? ",

2
locales/sv-SE.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "Administratörsinställningar",
"Default homepage: ": "Förvald hemsida: ",
"Feed menu: ": "Flödesmeny: ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "Topp påslaget? ",
"CAPTCHA enabled: ": "CAPTCHA påslaget? ",
"Login enabled: ": "Inloggning påslaget? ",

2
locales/tr.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "Yönetici tercihleri",
"Default homepage: ": "Öntanımlı ana sayfa: ",
"Feed menu: ": "Akış menüsü: ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "Top etkin: ",
"CAPTCHA enabled: ": "CAPTCHA etkin: ",
"Login enabled: ": "Oturum açma etkin: ",

2
locales/uk.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "Адміністраторські налаштування",
"Default homepage: ": "Усталена домашня сторінка: ",
"Feed menu: ": "Меню потоку з відео: ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "Увімкнути топ відео? ",
"CAPTCHA enabled: ": "Увімкнути капчу? ",
"Login enabled: ": "Увімкнути авторизацію? ",

2
locales/zh-CN.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "管理员选项",
"Default homepage: ": "默认主页: ",
"Feed menu: ": "Feed 菜单: ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "是否启用“热门视频”页: ",
"CAPTCHA enabled: ": "是否启用验证码: ",
"Login enabled: ": "是否启用登录: ",

2
locales/zh-TW.json
View File

@ -117,6 +117,8 @@
"Administrator preferences": "管理員偏好設定",
"Default homepage: ": "預設首頁： ",
"Feed menu: ": "Feed 選單： ",
"Show nickname on top: ": "",
"Welcome, `x`": "",
"Top enabled: ": "頂部啟用： ",
"CAPTCHA enabled: ": "CAPTCHA 啟用： ",
"Login enabled: ": "啟用登入： ",

1
src/invidious/helpers/helpers.cr
View File

@ -54,6 +54,7 @@ struct ConfigPreferences
property extend_desc : Bool = false
property volume : Int32 = 100
property vr_mode : Bool = true
property show_nick : Bool = true
def to_tuple
{% begin %}

5
src/invidious/routes/preferences.cr
View File

@ -68,6 +68,10 @@ class Invidious::Routes::PreferencesRoute < Invidious::Routes::BaseRoute
vr_mode ||= "off"
vr_mode = vr_mode == "on"
show_nick = env.params.body["show_nick"]?.try &.as(String)
show_nick ||= "off"
show_nick = show_nick == "on"
comments = [] of String
2.times do |i|
comments << (env.params.body["comments[#{i}]"]?.try &.as(String) || CONFIG.default_user_preferences.comments[i])
@ -155,6 +159,7 @@ class Invidious::Routes::PreferencesRoute < Invidious::Routes::BaseRoute
volume: volume,
extend_desc: extend_desc,
vr_mode: vr_mode,
show_nick: show_nick,
}.to_json).to_json
if user = env.get? "user"

1
src/invidious/users.cr
View File

@ -55,6 +55,7 @@ struct Preferences
property listen : Bool = CONFIG.default_user_preferences.listen
property local : Bool = CONFIG.default_user_preferences.local
property vr_mode : Bool = CONFIG.default_user_preferences.vr_mode
property show_nick : Bool = CONFIG.default_user_preferences.show_nick
@[JSON::Field(converter: Preferences::ProcessString)]
property locale : String = CONFIG.default_user_preferences.locale

6
src/invidious/views/preferences.ecr
View File

@ -175,6 +175,12 @@
</select>
<% end %>
</div>
<% if env.get? "user" %>
<div class="pure-control-group">
<label for="show_nick"><%= translate(locale, "Show nickname on top: ") %></label>
<input name="show_nick" id="show_nick" type="checkbox" <% if preferences.show_nick %>checked<% end %>>
</div>
<% end %>
<legend><%= translate(locale, "Miscellaneous preferences") %></legend>

5
src/invidious/views/template.ecr
View File

@ -67,6 +67,11 @@
<i class="icon ion-ios-cog"></i>
</a>
</div>
<% if env.get("preferences").as(Preferences).show_nick %>
<div class="pure-u-1-4">
<span id="user_name"><%= translate(locale, "Welcome, `x`", env.get("user").as(User).email) %></span>
</div>
<% end %>
<div class="pure-u-1-4">
<form action="/signout?referer=<%= env.get?("current_page") %>" method="post">
<input type="hidden" name="csrf_token" value="<%= URI.encode_www_form(env.get?("csrf_token").try &.as(String) || "") %>">