diff --git a/package.json b/package.json index 9e8997215..b8833f0f8 100755 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "*://www.4chan.org/feedback", "https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc*", "https://www.google.com/recaptcha/api2/frame?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc*", - "*://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc" + "*://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc*" ], "suffix": { "stable": "", diff --git a/src/General/Config.coffee b/src/General/Config.coffee index ab0677396..83a62e196 100755 --- a/src/General/Config.coffee +++ b/src/General/Config.coffee @@ -741,6 +741,8 @@ Config = #options:"sage";boards:jp;always """ + captchaLanguage: '' + time: '%m/%d/%y(%a)%H:%M:%S' backlink: '>>%id' diff --git a/src/General/Main.coffee b/src/General/Main.coffee index f9d849fe6..48d079995 100755 --- a/src/General/Main.coffee +++ b/src/General/Main.coffee @@ -10,6 +10,10 @@ Main = if location.hostname is 'www.4chan.org' $.onExists d.documentElement, 'body', false, -> $.addStyle Main.cssWWW + Conf = {'captchaLanguage': Config.captchaLanguage} + $.get Conf, (items) -> + $.extend Conf, items + Captcha.language.fixPage() return g.threads = new SimpleDict() @@ -310,6 +314,7 @@ Main = features: [ ['Polyfill', Polyfill] + ['Captcha Language', Captcha.language] ['Redirect', Redirect] ['Header', Header] ['Catalog Links', CatalogLinks] diff --git a/src/General/Settings.coffee b/src/General/Settings.coffee index 98e0571c6..09d8a652c 100755 --- a/src/General/Settings.coffee +++ b/src/General/Settings.coffee @@ -315,7 +315,7 @@ Settings = items = {} inputs = {} - for name in ['boardnav', 'time', 'backlink', 'fileInfo', 'favicon', 'usercss', 'customCooldown'] + for name in ['captchaLanguage', 'boardnav', 'time', 'backlink', 'fileInfo', 'favicon', 'usercss', 'customCooldown'] input = $ "[name='#{name}']", section items[name] = Conf[name] inputs[name] = input @@ -324,9 +324,9 @@ Settings = else if name is 'favicon' $.on input, 'change', $.cb.value $.on input, 'change', Settings[name] - else + else $.on input, 'input', $.cb.value - $.on input, 'input', Settings[name] + $.on input, 'input', Settings[name] if name of Settings # Quick Reply Personas ta = $ '.personafield', section @@ -339,8 +339,8 @@ Settings = for key, val of items input = inputs[key] input.value = val - continue if key in ['usercss', 'customCooldown'] - Settings[key].call input + if key of Settings and key isnt 'usercss' + Settings[key].call input return interval = $ 'input[name="Interval"]', section diff --git a/src/General/html/Settings/Advanced.html b/src/General/html/Settings/Advanced.html index 8d5d60063..478bfde5d 100755 --- a/src/General/html/Settings/Advanced.html +++ b/src/General/html/Settings/Advanced.html @@ -12,6 +12,12 @@ +
+