Skip to content

Commit 2ce4468

Browse files
committed
rename system_username to site_contact_username , system_user is a special user with -1 id that is only used for certain admin tasks
for example system_user will autoclose stuff if needed, it will delete stubs and be the target for flag pms
1 parent 41a1b69 commit 2ce4468

27 files changed

Lines changed: 56 additions & 49 deletions

app/models/admin_dashboard_data.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def problems
3737
send_consumer_email_check,
3838
title_check,
3939
access_password_removal,
40-
system_username_check,
40+
site_contact_username_check,
4141
notification_email_check ].compact
4242
end
4343

@@ -148,8 +148,8 @@ def send_consumer_email_check
148148
I18n.t('dashboard.consumer_email_warning') if Rails.env == 'production' and ActionMailer::Base.smtp_settings[:address] =~ /gmail\.com|live\.com|yahoo\.com/
149149
end
150150

151-
def system_username_check
152-
I18n.t('dashboard.system_username_warning') if SiteSetting.system_username.blank?
151+
def site_contact_username_check
152+
I18n.t('dashboard.site_contact_username_warning') if SiteSetting.site_contact_username.blank?
153153
end
154154

155155
def notification_email_check

app/models/site_setting.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class SiteSetting < ActiveRecord::Base
9393
client_setting(:edit_history_visible_to_public, true)
9494
client_setting(:delete_removed_posts_after, 24) # hours
9595
setting(:post_undo_action_window_mins, 10)
96-
setting(:system_username, '')
96+
setting(:site_contact_username, '')
9797
setting(:max_mentions_per_post, 10)
9898
setting(:newuser_max_mentions_per_post, 2)
9999

config/locales/server.cs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ cs:
435435
title_nag: "Název webu je nastaven na výchozí hodnotu. Prosím, změňte název webu na skutečný název v <a href='/admin/site_settings'>Nastavení webu</a>."
436436
consumer_email_warning: "Váš web je nastaven, aby používal Gmail (nebo jinou uživatelskou emailovou službu) k odesílání emailů. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail limituje počet emailů, které můžete odeslat</a>. Zvažte použití jiného emailového poskytovatele, jako je třeba mandrill.com k zajištění doručitelnosti emailů."
437437
access_password_removal: "Váš web používá nastavení access_password, které je již odstraněno. Nová nastavení login_required a must_approve_users by měla být použita místo toho. Nastavení můžete změnit v<a href='/admin/site_settings'>Nastavení webu</a>. Nezapomeňte <a href='/admin/users/list/pending'>schválit uživatele v seznamu čekajících uživatelůt</a>. (Tato zpráva zmizí za 2 dny.)"
438-
system_username_warning: "Nastavení system_username je prázdné. Prosím, napravte to v <a href='/admin/site_settings'>Nastavení webu</a>. Nastavte ho na uživatelské jméno administrátora, která má být odesilatelem systémových zpráv."
438+
site_contact_username_warning: "Nastavení system_username je prázdné. Prosím, napravte to v <a href='/admin/site_settings'>Nastavení webu</a>. Nastavte ho na uživatelské jméno administrátora, která má být odesilatelem systémových zpráv."
439439
notification_email_warning: "Nastavení notification_email je prázdné. Prosím, napravte to v <a href='/admin/site_settings'>Nastavení webu</a>."
440440

441441
content_types:
@@ -548,7 +548,7 @@ cs:
548548
track_external_right_clicks: "Počítat kliknutí na externí odkazy pravým tlačítkem (např. otevření do nové záložky); defaultně zakázáno kvůli přepisu URL"
549549
topics_per_page: "Kolik témat je načteno do seznamu témat"
550550
posts_per_page: "Kolik příspěvků je zobrazeno ve stránce tématu"
551-
system_username: "Uživatelské jméno, za které se zasílají automatické soukromé zprávy"
551+
site_contact_username: "Uživatelské jméno, za které se zasílají automatické soukromé zprávy"
552552
send_welcome_message: "Mají noví uživatelé obdržet uvítací soukromou zprávu?"
553553
suppress_reply_directly_below: "Nezobrazovat počet odpovědí, pokud existuje jen jediná odpověď hned pod příspěvkem"
554554
suppress_reply_directly_above: "Nezobrazovat informaci 'je odpověď na' u příspěvku, jehož odpověď je přímo nad ním"

config/locales/server.da.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ da:
349349
track_external_right_clicks: "Track external links that are right clicked (eg: open in new tab) disabled by default because it rewrites URLs"
350350
topics_per_page: "How many topics are loaded by default on the topics list page"
351351
posts_per_page: "How many posts are returned on a topic page"
352-
system_username: "Username for the author of automated private messages sent by the forum"
352+
site_contact_username: "Username for the author of automated private messages sent by the forum"
353353
send_welcome_message: "Do new users get a welcome private message?"
354354
suppress_reply_directly_below: "Don't show reply count on a post when there is a single reply directly below"
355355
allow_index_in_robots_txt: "Site should be indexed by search engines (update robots.txt)"

config/locales/server.de.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ de:
404404
title_nag: "Der Titel der Seite wurde noch nicht angepasst. Bitte bearbeite diesen in den <a href='/admin/site_settings'>Einstellungen</a>."
405405
consumer_email_warning: "Deine Seite verwendet Gmail um Mails zu senden. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail hat eine Limite zum Senden von Mails</a>. Um die Mail-Zustellung zu gewährleisten, solltest du einen anderen Mail Service in Erwägung ziehen."
406406
access_password_removal: "Deine Seite hat die Einstellung access_password verwendet, welche entfernt wurde. Die Einstellungen login_required und must_approve_users wurden eingeschalten und werden sofort verwendet. Du kannst diese in <a href='/admin/site_settings'>den Einstellungen</a> wechseln. Stelle sicher, <a href='/admin/users/list/pending'>dass die Benutzer in der Warteliste</a> aktiviert werden. (Diese Meldung wird in 2 Tagen nicht mehr angezeigt.)"
407-
system_username_warning: "Die Einstellung system_username ist leer. Bitte ändere diese in <a href='/admin/site_settings'>den Einstellungen</a>. Setzte einen Benutzernamen eines Administrators, welcher als Sender der Systemnachrichten verwendet werden soll."
407+
site_contact_username_warning: "Die Einstellung system_username ist leer. Bitte ändere diese in <a href='/admin/site_settings'>den Einstellungen</a>. Setzte einen Benutzernamen eines Administrators, welcher als Sender der Systemnachrichten verwendet werden soll."
408408
notification_email_warning: "Die Einstellung notification_email ist leer. Bitte ändere diese in <a href='/admin/site_settings'>den Einstellungen</a>."
409409

410410
content_types:
@@ -521,7 +521,7 @@ de:
521521
track_external_right_clicks: "Verfolge, welche externen Links per Rechtsklick geöffnet werden (zum Beispiel in einem neuen Browser-Tab). Standardmäßig deaktiviert, da dies URL-Rewrites erfordert."
522522
topics_per_page: "Zahl der Themen, die standardmäßig auf die Themenübersichtsseite geladen werden."
523523
posts_per_page: "Zahl der Beiträge, die auf einer Themenseite gezeigt werden."
524-
system_username: "Benutzername des Autors für automatisch vom Forum versendete private Nachrichten."
524+
site_contact_username: "Benutzername des Autors für automatisch vom Forum versendete private Nachrichten."
525525
send_welcome_message: "Bekommen neue Nutzer eine Willkommensnachricht?"
526526
suppress_reply_directly_below: "Zeige die Zahl der Antworten auf einen Beitrag nicht, falls die einzige Antwort direkt darunter folgt."
527527
suppress_reply_directly_above: "Zeige 'In Antwort auf' nicht, falls der Beitrag direkt über der einzigen Antwort folgt."

config/locales/server.en.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ en:
404404
title_nag: "The title Site Setting is still set to the default value. Please update it with your site's title in the <a href='/admin/site_settings'>Site Settings</a>."
405405
consumer_email_warning: "Your site is configured to use Gmail (or another consumer email service) to send email. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail limits how many emails you can send</a>. Consider using an email service provider like mandrill.com to ensure email deliverability."
406406
access_password_removal: "Your site was using the access_password setting, which has been removed. The login_required and must_approve_users settings have been enabled, which should be used instead. You can change them in the <a href='/admin/site_settings'>Site Settings</a>. Be sure to <a href='/admin/users/list/pending'>approve users in the Pending Users list</a>. (This message will go away after 2 days.)"
407-
system_username_warning: "The system_username setting is blank. Please update it in the <a href='/admin/site_settings'>Site Settings</a>. Set it to the username of an admin user who should be the sender of system messages."
407+
site_contact_username_warning: "The system_username setting is blank. Please update it in the <a href='/admin/site_settings'>Site Settings</a>. Set it to the username of an admin user who should be the sender of system messages."
408408
notification_email_warning: "The notification_email setting is blank. Please update it in the <a href='/admin/site_settings'>Site Settings</a>."
409409

410410
content_types:
@@ -521,7 +521,7 @@ en:
521521
track_external_right_clicks: "Track external links that are right clicked (eg: open in new tab) disabled by default because it rewrites URLs"
522522
topics_per_page: "How many topics loaded by default on the topics list page"
523523
posts_per_page: "How many posts loaded by default on a topic page, and when loading more posts"
524-
system_username: "Username for the author of automated private messages sent by the forum"
524+
site_contact_username: "Username for the author of automated private messages sent by the forum"
525525
send_welcome_message: "Do new users get a welcome private message?"
526526
suppress_reply_directly_below: "Don't show reply count on a post when there is a single reply directly below"
527527
suppress_reply_directly_above: "Don't show in-reply-to on a post when there is a single reply directly above"

config/locales/server.es.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ es:
337337
track_external_right_clicks: "Track external links that are right clicked (eg: open in new tab) disabled by default because it rewrites URLs"
338338
topics_per_page: "Cuantos topics son cargados por defecto en la página de lista de topics"
339339
posts_per_page: "Cuantos posts son devueltos en una página de topic"
340-
system_username: "Nombre de usuario para el autor de mensajes privados enviados por el foro"
340+
site_contact_username: "Nombre de usuario para el autor de mensajes privados enviados por el foro"
341341
send_welcome_message: "¿Reciben los nuevos usuarios un mensaje privado de bienvenida?"
342342
suppress_reply_directly_below: "No mostrar el contador de respuestas en un pot cuando una única respuesta directamente debajo"
343343
allow_index_in_robots_txt: "Permitir que el sitio sea indexado por motores de búsqueda (sobreescribe robots.txt)"

config/locales/server.fr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ fr:
489489
track_external_right_clicks: "Suivi des clics sur les liens externes (ex: ouverture dans un nouvel onglet) désactivé par défaut car nécessite une ré-écrite de toutes les urls et nuit à l'accessibilité"
490490
topics_per_page: "Nombre de discussions à afficher sur la page de liste des discussions."
491491
posts_per_page: "Nombre de messages retournés sur une page de discussion"
492-
system_username: "Pseudo qui envoie les messages automatiques"
492+
site_contact_username: "Pseudo qui envoie les messages automatiques"
493493
send_welcome_message: "Les nouveaux utilisateurs reçoivent-ils un message privé de bienvenue ?"
494494
suppress_reply_directly_below: "Ne pas afficher les boutons de réponse sous un message lorsque la réponse est juste en dessous"
495495
allow_index_in_robots_txt: "Le site doit-être indexé par les moteurs de recherche (met à jour le fichier robots.txt)"

config/locales/server.id.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ id:
348348
track_external_right_clicks: "Track external links that are right clicked (eg: open in new tab) disabled by default because it rewrites URLs"
349349
topics_per_page: "How many topics are loaded by default on the topics list page"
350350
posts_per_page: "How many posts are returned on a topic page"
351-
system_username: "Username for the author of automated private messages sent by the forum"
351+
site_contact_username: "Username for the author of automated private messages sent by the forum"
352352
send_welcome_message: "Do new users get a welcome private message?"
353353
suppress_reply_directly_below: "Don't show reply count on a post when there is a single reply directly below"
354354
allow_index_in_robots_txt: "Site should be indexed by search engines (update robots.txt)"

config/locales/server.it.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ it:
470470
track_external_right_clicks: "Traccia i link esterni sui quali viene fatto click destro (es: apri in una nuova tab). Disabilitato di default perché viene fatto il rewrite delle URL"
471471
topics_per_page: "Quanti topic vengono caricati di default nella pagina di lista topic"
472472
posts_per_page: "Quanti post vengono restituiti in una pagina di un topic"
473-
system_username: "Username dell'autore dei messaggi privati automatizzati spediti dal forum"
473+
site_contact_username: "Username dell'autore dei messaggi privati automatizzati spediti dal forum"
474474
send_welcome_message: "I nuovi utenti ricevono un messaggio di benvenuto?"
475475
suppress_reply_directly_below: "Non mostrare il numero di risposte ad un post quando c'è una singola risposta appena sotto"
476476
allow_index_in_robots_txt: "Il sito è indicizzabile dai motori di ricerta (aggiorna robots.txt)"

0 commit comments

Comments
 (0)