diff --git a/app/models/post.rb b/app/models/post.rb index d658dbb4c0f..9ca8c4a0ea2 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -163,9 +163,9 @@ class Post < ActiveRecord::Base hosts = SiteSetting .white_listed_spam_host_domains - .split(",") + .split('|') .map{|h| h.strip} - .reject{|h| !h.include?(".")} + .reject{|h| !h.include?('.')} hosts << GlobalSetting.hostname diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml index 3d4886c32d8..2b5a841fbdb 100644 --- a/config/locales/server.cs.yml +++ b/config/locales/server.cs.yml @@ -742,7 +742,7 @@ cs: tos_url: "Pokud máte dokument 'Podmínky Používání' hostovaný samostatně, napište sem jeho plnou URL." privacy_policy_url: "Pokud máte dokument 'Ochrana Soukromí' hostovaný samostatně, napište sem jeho plnou URL." newuser_spam_host_threshold: "Kolikrát smí uživatel zaslat odkaz na stejný server v rámci příspěvků z nastavení 'newuser_spam_host_posts', než budou příspěvky považovány za spam." - white_listed_spam_host_domains: A comma delimited list of domains excluded from spam host testing, new users will be able to create an unrestricted count of posts with links to this domain + white_listed_spam_host_domains: A pipe-delimited list of domains excluded from spam host testing, new users will be able to create an unrestricted count of posts with links to this domain staff_like_weight: "Extra hodnota pro 'líbí se' od uživatelů, kteří jsou součástí personálu webu." reply_by_email_enabled: Jestli toto fórum umožňuje odpovědi emailem reply_by_email_address: 'Šablona emailé adresy pro odpověď emailem, např. %{reply_key}@reply.myforum.com' diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index fd985bdef1c..420c3162ad0 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -606,7 +606,7 @@ en: max_image_height: "Maximum allowed height of images in a post" category_featured_topics: "Number of topics displayed per category on the /categories page. After changing this value, it takes up to 15 minutes for the categories page to update." add_rel_nofollow_to_user_content: "Add rel nofollow to all submitted user content, except for internal links (including parent domains) changing this requires you update all your baked markdown with: \"rake posts:rebake\"" - exclude_rel_nofollow_domains: "A comma delimited list of domains where nofollow is not added (tld.com will automatically allow sub.tld.com as well)" + exclude_rel_nofollow_domains: "A pipe-delimited list of domains where nofollow is not added (tld.com will automatically allow sub.tld.com as well)" post_excerpt_maxlength: "Maximum length in chars of a post's excerpt" post_onebox_maxlength: "Maximum length of a oneboxed Discourse post" @@ -809,7 +809,7 @@ en: newuser_spam_host_threshold: "How many times a new user can post a link to the same host within their `newuser_spam_host_posts` posts before being considered spam." - white_listed_spam_host_domains: "A comma delimited list of domains excluded from spam host testing, new users will be able to create an unrestricted count of posts with links to this domain" + white_listed_spam_host_domains: "A pipe-delimited list of domains excluded from spam host testing, new users will be able to create an unrestricted count of posts with links to this domain" staff_like_weight: "Extra weighting factor given to likes when performed by staff." reply_by_email_enabled: "Enable replying to topics via email" diff --git a/config/locales/server.id.yml b/config/locales/server.id.yml index ba8f9669db4..caa592d39a6 100644 --- a/config/locales/server.id.yml +++ b/config/locales/server.id.yml @@ -313,7 +313,7 @@ id: max_image_width: "Maximum allowed width of images in a post" category_featured_topics: "Number of topics displayed per category in the /categories page" add_rel_nofollow_to_user_content: "Add rel nofollow to all submitted user content, except for internal links (including parent domains) changing this requires you update all your baked markdown" - exclude_rel_nofollow_domains: "A comma delimited list of domains where nofollow is not added (tld.com will automatically allow sub.tld.com as well)" + exclude_rel_nofollow_domains: "A pipe-delimited list of domains where nofollow is not added (tld.com will automatically allow sub.tld.com as well)" post_excerpt_maxlength: "Maximum length in chars of a post's excerpt" post_onebox_maxlength: "Maximum length of a oneboxed Discourse post" diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml index ea71fd3a064..b7ac3297775 100644 --- a/config/locales/server.ko.yml +++ b/config/locales/server.ko.yml @@ -509,7 +509,7 @@ ko: max_image_height: "게시글에서 허용하는 이미지 최대 높이" category_featured_topics: "Number of topics displayed per category in the /categories page" add_rel_nofollow_to_user_content: "Add rel nofollow to all submitted user content, except for internal links (including parent domains) changing this requires you update all your baked markdown" - exclude_rel_nofollow_domains: "A comma delimited list of domains where nofollow is not added (tld.com will automatically allow sub.tld.com as well)" + exclude_rel_nofollow_domains: "A pipe-delimited list of domains where nofollow is not added (tld.com will automatically allow sub.tld.com as well)" post_excerpt_maxlength: "Maximum length in chars of a post's excerpt" post_onebox_maxlength: "Maximum length of a oneboxed Discourse post" diff --git a/db/migrate/20140407202158_site_setting_comma_to_pipe.rb b/db/migrate/20140407202158_site_setting_comma_to_pipe.rb new file mode 100644 index 00000000000..86fe7d4b63d --- /dev/null +++ b/db/migrate/20140407202158_site_setting_comma_to_pipe.rb @@ -0,0 +1,31 @@ +class SiteSettingCommaToPipe < ActiveRecord::Migration + def up + execute <