From 6fb323fd71f26e77423d58a421fd568bf934f48d Mon Sep 17 00:00:00 2001 From: slainer68 Date: Thu, 27 Mar 2014 00:44:13 +0100 Subject: [PATCH] Delete enable_local_account_create option as it is not used anywhere. JS fixture --- config/locales/server.cs.yml | 1 - config/locales/server.da.yml | 1 - config/locales/server.de.yml | 1 - config/locales/server.en.yml | 1 - config/locales/server.fr.yml | 1 - config/locales/server.it.yml | 1 - config/locales/server.ja.yml | 1 - config/locales/server.ko.yml | 1 - config/locales/server.nl.yml | 7 +++---- config/locales/server.pt_BR.yml | 1 - config/locales/server.ru.yml | 1 - config/site_settings.yml | 3 --- test/javascripts/fixtures/site_settings_fixtures.js | 2 +- 13 files changed, 4 insertions(+), 18 deletions(-) diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml index 25df8744331..f50e9524ae6 100644 --- a/config/locales/server.cs.yml +++ b/config/locales/server.cs.yml @@ -655,7 +655,6 @@ cs: sso_overrides_username: 'Přepisuje místní uživatelské jméno tím z dat SSO (VAROVÁNÍ: kvůli rozdílnostem v požadavcích na uživatelské jméno může dojít k nesrovnalostem)' sso_overrides_name: 'Přepisuje místní jméno tím z dat SSO (VAROVÁNÍ: kvůli normalizování místního jména může dojít k nesrovnalostem)' enable_local_logins: Povolit lokální autentizaci - enable_local_account_create: Povolit lokální vytváření účtů enable_google_logins: Povolit přihlašování přes Google enable_yahoo_logins: Povolit přihlašování přes Yahoo enable_twitter_logins: "Povolit přihlašování přes Twitter, vyžaduje správně nastavené 'twitter_consumer_key' a 'twitter_consumer_secret'" diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml index 5939861a12d..a033121b4d0 100644 --- a/config/locales/server.da.yml +++ b/config/locales/server.da.yml @@ -635,7 +635,6 @@ da: min_password_length: "Mindste adgangskodelængde." block_common_passwords: "Tillad ikke adgangskoder som er blandt de 5000 med almindelige adgangskoder" enable_local_logins: "Aktivér traditionel, lokal godkendelse med brugernavn og adgangskode" - enable_local_account_create: "Aktivér oprettelse af nye lokale konti" enable_google_logins: "Aktivér Google-login" enable_yahoo_logins: "Aktivér Yahoo-login" diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml index ff54bd2df72..0102fa7208c 100644 --- a/config/locales/server.de.yml +++ b/config/locales/server.de.yml @@ -545,7 +545,6 @@ de: login_required: "Zum Lesen der Beiträge must du angemeldet sein" enable_local_logins: "Aktiviere lokale Authentisierung" - enable_local_account_create: "Aktiviere lokale Kontoerstellung" enable_google_logins: "Aktiviere Google Authentisierung." enable_yahoo_logins: "Aktiviere Yahoo Authentisierung." diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 29a1155ff51..77a843277e0 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -699,7 +699,6 @@ en: sso_overrides_name: "Overrides local name with external site name from SSO payload (WARNING: discrepancies can occur due to normalization of local names)" enable_local_logins: "Enable traditional, local username and password authentication" - enable_local_account_create: "Enable creating new local accounts" enable_google_logins: "Enable Google authentication" enable_yahoo_logins: "Enable Yahoo authentication" diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index 1597d49b60c..275a30aee41 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -634,7 +634,6 @@ fr: sso_overrides_username: "Surcharger les noms locaux avec les noms externes d'un SSO (ATTENTION: Des écarts peuvent se produire due aux règles locales sur les noms d'utilisateur)" sso_overrides_name: "Surcharger les pseudos locaux avec les pseudos externes d'un SSO (ATTENTION: Des écarts peuvent se produire due aux règles locales sur les pseudos)" enable_local_logins: "Activer l'authentification traditionnelle, avec pseudo local et mot de passe" - enable_local_account_create: "Activer la création de nouveaux comptes locaux" enable_google_logins: "Active l'authentification Google" enable_yahoo_logins: "Active l'authentification Yahoo" enable_twitter_logins: "Active l'authentification Twitter, nécessite twitter_consumer_key et twitter_consumer_secret" diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml index f7fa611d3b0..4ca43648d5c 100644 --- a/config/locales/server.it.yml +++ b/config/locales/server.it.yml @@ -623,7 +623,6 @@ it: sso_overrides_username: "Sostituisce gli username locali con quelli del sito esterno con cui ci si è connessi tramite SSO (ATTENZIONE: potrebbero avvenire discrepanze a causa delle differenze dei requisiti di lunghezza)" sso_overrides_name: "Sostituisce i nomi locali con quelli del sito esterno con cui ci si è connessi tramite SSO (ATTENZIONE: potrebbero avvenire discrepanze a causa delle direttive per i nomi locali)" enable_local_logins: "Abilita l'autenticazione locale di username e password" - enable_local_account_create: "Permetti di creare nuovi account locali" enable_google_logins: "Abilita l'autenticazione via Google" enable_yahoo_logins: "Abilita l'autenticazione via Yahoo" enable_twitter_logins: "Abilita l'autenticazione via Twitter, richiede twitter_consumer_key e twitter_consumer_secret" diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml index ab82d97fcfd..65fa68a3290 100644 --- a/config/locales/server.ja.yml +++ b/config/locales/server.ja.yml @@ -597,7 +597,6 @@ ja: login_required: "ポストを読むのにログインを必須にする" enable_local_logins: "従来型のローカルユーザ名とパスワードによる認証を有効にする" - enable_local_account_create: "新規ローカルアカウントの作成を有効にする" enable_google_logins: "Google 認証を有効にする" enable_yahoo_logins: "Yahoo 認証を有効にする" diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml index ace616d2a74..ea71fd3a064 100644 --- a/config/locales/server.ko.yml +++ b/config/locales/server.ko.yml @@ -584,7 +584,6 @@ ko: login_required: "게시글을 읽기 위해서 인증이 필요함" enable_local_logins: "전통적인 로컬 사용자이름과 패스워드 인증을 활성화" - enable_local_account_create: "새로운 로컬 계정 만들기 활성화" enable_google_logins: "Enable Google authentication" enable_yahoo_logins: "Enable Yahoo authentication" diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml index 7fafd4cd321..15b8b9084f9 100644 --- a/config/locales/server.nl.yml +++ b/config/locales/server.nl.yml @@ -701,7 +701,6 @@ nl: sso_overrides_name: "Gebruikt de naam die gebruikt wordt bij de SSO service i.p.v. de lokaal opgegeven naam. (WAARSCHUWING: er kunnen discrepanties ontstaan door normalisatie van lokale namen)" enable_local_logins: Zet lokaal inloggen aan - enable_local_account_create: Zet lokaal account aanmaken aan enable_google_logins: Zet inloggen met Google aan enable_yahoo_logins: "Zet inloggen met Yahoo! aan" @@ -1165,7 +1164,7 @@ nl: Bekijk het volgende bericht. Fout - %{error} - + %{source} email_reject_trust_level: @@ -1295,9 +1294,9 @@ nl: subject_template: "[%{site_name}] [PM] %{topic_title}" text_body_template: | %{message} - + %{context} - + --- %{respond_instructions} diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml index 0a05f422db1..379746da43e 100644 --- a/config/locales/server.pt_BR.yml +++ b/config/locales/server.pt_BR.yml @@ -607,7 +607,6 @@ pt_BR: sso_overrides_username: "Substitui nome de usuário local com nome de usuário do site externo do servidor SSO (ATENÇÃO: discrepâncias podem ocorrer devido a diferenças nos requerimentos de comprimento de nome de usuário)" sso_overrides_name: "Substitui nome local com o nome do site externo do servidor SSO (ATENÇÃO: discrepâncias podem ocorrer devido à normalização de nomes locais)" enable_local_logins: "Ativar autenticação local" - enable_local_account_create: "Ativar criação de conta local" enable_google_logins: "Ativar autenticação pelo Google" enable_yahoo_logins: "Ativar autenticação pelo Yahoo" enable_twitter_logins: "Ativar autenticação pelo Twitter, requer twitter_consumer_key e twitter_consumer_secret" diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml index c8d6d60bbc8..ac8b78d27a4 100644 --- a/config/locales/server.ru.yml +++ b/config/locales/server.ru.yml @@ -637,7 +637,6 @@ ru: min_password_length: 'Минимальная длина пароля' block_common_passwords: 'Не позволять использовать пароли из списка 5000 частоиспользуемых паролей.' enable_local_logins: 'Включить традиционную аутентификацию по имени пользователя и пароля' - enable_local_account_create: 'Включить создание новых учетных записей' enable_google_logins: 'Разрешить идентификацию с Google' enable_yahoo_logins: 'Разрешить идентификацию с Yahoo' enable_twitter_logins: 'Разрешить идентификацию с Twitter, требует twitter_consumer_key и twitter_consumer_secret' diff --git a/config/site_settings.yml b/config/site_settings.yml index 7fc68cba420..cc28beab7f8 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -96,9 +96,6 @@ users: enable_local_logins: client: true default: true - enable_local_account_create: - client: true - default: true min_username_length: client: true default: 3 diff --git a/test/javascripts/fixtures/site_settings_fixtures.js b/test/javascripts/fixtures/site_settings_fixtures.js index 04bccb8ae9b..08f0b26bea0 100644 --- a/test/javascripts/fixtures/site_settings_fixtures.js +++ b/test/javascripts/fixtures/site_settings_fixtures.js @@ -1,3 +1,3 @@ /*jshint maxlen:10000000 */ -Discourse.SiteSettingsOriginal = {"title":"Discourse Meta","logo_url":"/assets/logo.png","logo_small_url":"/assets/logo-single.png","traditional_markdown_linebreaks":false,"top_menu":"latest|new|unread|read|starred|categories","post_menu":"like|edit|flag|delete|share|bookmark|reply","share_links":"twitter|facebook|google+|email","track_external_right_clicks":false,"must_approve_users":false,"ga_tracking_code":"UA-33736483-2","ga_domain_name":"","enable_long_polling":true,"polling_interval":3000,"anon_polling_interval":30000,"min_post_length":20,"max_post_length":16000,"min_topic_title_length":15,"max_topic_title_length":255,"min_private_message_title_length":2,"allow_uncategorized_topics":true,"min_search_term_length":3,"flush_timings_secs":5,"suppress_reply_directly_below":true,"email_domains_blacklist":"mailinator.com","email_domains_whitelist":null,"version_checks":true,"min_title_similar_length":10,"min_body_similar_length":15,"category_colors":"BF1E2E|F1592A|F7941D|9EB83B|3AB54A|12A89D|25AAE2|0E76BD|652D90|92278F|ED207B|8C6238|231F20|808281|B3B5B4|283890","max_upload_size_kb":1024,"category_featured_topics":6,"favicon_url":"/assets/favicon.ico","dynamic_favicon":false,"uncategorized_name":"uncategorized","uncategorized_color":"AB9364","uncategorized_text_color":"FFFFFF","invite_only":false,"login_required":false,"min_password_length":8,"enable_local_logins":true,"enable_local_account_create":true,"enable_google_logins":true,"enable_yahoo_logins":true,"enable_twitter_logins":true,"enable_facebook_logins":true,"enable_cas_logins":false,"enable_github_logins":true,"enable_persona_logins":true,"educate_until_posts":2,"topic_views_heat_low":1000,"topic_views_heat_medium":2000,"topic_views_heat_high":5000,"min_private_message_post_length":5,"faq_url":"","tos_url":"","privacy_policy_url":"","authorized_extensions":".jpg|.jpeg|.png|.gif|.txt","relative_date_duration":14,"delete_removed_posts_after":24,"delete_user_max_post_age":7, "default_code_lang": "lang-auto", "suppress_uncategorized_badge": true}; +Discourse.SiteSettingsOriginal = {"title":"Discourse Meta","logo_url":"/assets/logo.png","logo_small_url":"/assets/logo-single.png","traditional_markdown_linebreaks":false,"top_menu":"latest|new|unread|read|starred|categories","post_menu":"like|edit|flag|delete|share|bookmark|reply","share_links":"twitter|facebook|google+|email","track_external_right_clicks":false,"must_approve_users":false,"ga_tracking_code":"UA-33736483-2","ga_domain_name":"","enable_long_polling":true,"polling_interval":3000,"anon_polling_interval":30000,"min_post_length":20,"max_post_length":16000,"min_topic_title_length":15,"max_topic_title_length":255,"min_private_message_title_length":2,"allow_uncategorized_topics":true,"min_search_term_length":3,"flush_timings_secs":5,"suppress_reply_directly_below":true,"email_domains_blacklist":"mailinator.com","email_domains_whitelist":null,"version_checks":true,"min_title_similar_length":10,"min_body_similar_length":15,"category_colors":"BF1E2E|F1592A|F7941D|9EB83B|3AB54A|12A89D|25AAE2|0E76BD|652D90|92278F|ED207B|8C6238|231F20|808281|B3B5B4|283890","max_upload_size_kb":1024,"category_featured_topics":6,"favicon_url":"/assets/favicon.ico","dynamic_favicon":false,"uncategorized_name":"uncategorized","uncategorized_color":"AB9364","uncategorized_text_color":"FFFFFF","invite_only":false,"login_required":false,"min_password_length":8,"enable_local_logins":true,"enable_google_logins":true,"enable_yahoo_logins":true,"enable_twitter_logins":true,"enable_facebook_logins":true,"enable_cas_logins":false,"enable_github_logins":true,"enable_persona_logins":true,"educate_until_posts":2,"topic_views_heat_low":1000,"topic_views_heat_medium":2000,"topic_views_heat_high":5000,"min_private_message_post_length":5,"faq_url":"","tos_url":"","privacy_policy_url":"","authorized_extensions":".jpg|.jpeg|.png|.gif|.txt","relative_date_duration":14,"delete_removed_posts_after":24,"delete_user_max_post_age":7, "default_code_lang": "lang-auto", "suppress_uncategorized_badge": true}; Discourse.SiteSettings = jQuery.extend(true, {}, Discourse.SiteSettingsOriginal);