diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml index 4b335e36014..26c319d5864 100644 --- a/config/locales/server.ar.yml +++ b/config/locales/server.ar.yml @@ -1039,7 +1039,6 @@ ar: enable_facebook_logins: "تفعيل تسجيل الدخول عن طريق حساب الفيسبوك." facebook_app_id: "رقم تعريف تطبيق الفيسبوك المستخدم لنظام تسجيل الدخول، يمكنك الحصور علية من هنا https://developers.facebook.com/apps" facebook_app_secret: "الرقم السري لتطبيق الفيسبوك المستخدم لنظام تسجيل الدخول، يمكنك الحصور علية من هنا https://developers.facebook.com/apps" - facebook_request_extra_profile_details: "اطلب من الفيسبوك البيانات \"عني و الموقع الجغرافي و الموقع الالكتروني\". ( يتطلب ان يكون التطبيق المستخدم موافق عليه من قبل الفيسبوك )" enable_github_logins: "فعّل استيثاق غِت‌هَب، يتطلّب github_client_id وgithub_client_secret" github_client_id: "هوية العميل للمصادقة جيثب، مسجلة في https://github.com/settings/applications" github_client_secret: "هوية العميل للمصادقة جيثب، مسجلة في https://github.com/settings/applications" diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml index ef6c1eca094..b3de1d72d58 100644 --- a/config/locales/server.ca.yml +++ b/config/locales/server.ca.yml @@ -908,7 +908,6 @@ ca: enable_facebook_logins: "Activa l'autenticació amb Facebook, necessita facebook_app_id i facebook_app_secret" facebook_app_id: "Id d'app per a l'autenticació amb Facebook, registrada a https://developers.facebook.com/apps" facebook_app_secret: "Secret d'app per a l'autenticació amb Facebook, registrat a https://developers.facebook.com/apps" - facebook_request_extra_profile_details: "Demana sobre mi, ubicació i lloc web de Facebook. (necessita que la teva aplicació sigui aprovada per Facebook)" enable_github_logins: "Activar l'autenticació de GitHub, necessita github_client_id i github_client_secret" github_client_id: "Id client per a l'autenticació amb Github, registrada a https://github.com/settings/applications" github_client_secret: "Secret de client per a l'autenticació amb GitHub, registrat a https://github.com/settings/applications" diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml index ceda8760422..2dff51c7a4b 100644 --- a/config/locales/server.de.yml +++ b/config/locales/server.de.yml @@ -1113,7 +1113,6 @@ de: enable_facebook_logins: "Aktiviere Facebook-Authentifizierung (benötigt facebook_app_id und facebook_app_secret)." facebook_app_id: "App-ID für Facebook-Authentifizierung, registriert auf https://developers.facebook.com/apps" facebook_app_secret: "App Secret für Facebook-Authentifizierung, registriert auf https://developers.facebook.com/apps" - facebook_request_extra_profile_details: "Anfrage zu \"über mich\", Standort und Website von Facebook. (erfordert, dass Deine auth-Anwendung von Facebook genehmigt wurde)" enable_github_logins: "Aktiviere GitHub-Authentifizierung (benötigt github_client_id und github_client_secret)." github_client_id: "Client-ID für GitHub-uthentifizierung, registriert auf https://github.com/settings/applications" github_client_secret: "Client Secret für GitHub-Authentifizierung, registriert auf https://github.com/settings/applications" diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml index 8e45fdd4ff7..35dbe3a1af0 100644 --- a/config/locales/server.el.yml +++ b/config/locales/server.el.yml @@ -1005,7 +1005,6 @@ el: enable_facebook_logins: "Ενεργοποίησε την επαλήθευση μέσω Facebook, απαιτεί facebook_app_id και facebook_app_secret" facebook_app_id: "App id για επαλήθευση μέσω Facebook, εγγεγραμμένο στο https://developers.facebook.com/apps" facebook_app_secret: "App secret για επαλήθευση μέσω Facebook, εγγεγραμμένο στο https://developers.facebook.com/apps" - facebook_request_extra_profile_details: "Ζήτησε σχετικά με μένα, τοποθεσία και ιστοσελίδα από το facebook. (απαιτείται έγκριση της εφαρμογής σου από το facebook)" enable_github_logins: "Ενεργοποίησε την επαλήθευση μέσω Github, απαιτεί github_client_id και github_client_secret" github_client_id: "Client id για επαλήθευση μέσω Github, εγγεγραμμένο στο https://github.com/settings/applications" github_client_secret: "Client secret για επαλήθευση μέσω Github, εγγεγραμμένο στο https://github.com/settings/applications" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 8b7df40fb28..8d492252250 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1232,7 +1232,6 @@ en: enable_facebook_logins: "Enable Facebook authentication, requires facebook_app_id and facebook_app_secret" facebook_app_id: "App id for Facebook authentication, registered at https://developers.facebook.com/apps" facebook_app_secret: "App secret for Facebook authentication, registered at https://developers.facebook.com/apps" - facebook_request_extra_profile_details: "Request about me, location and website from facebook. (requires that your auth application be approved by facebook)" enable_github_logins: "Enable Github authentication, requires github_client_id and github_client_secret" github_client_id: "Client id for Github authentication, registered at https://github.com/settings/applications" diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index 19fe47e7175..e8e86480d2a 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -1108,7 +1108,6 @@ es: enable_facebook_logins: "Activar autenticación por Facebook, requiere una facebook_app_id y un facebook_app_secret" facebook_app_id: "App id para la autenticación por Facebook, registrado en https://developers.facebook.com/apps" facebook_app_secret: "App secret para autenticación por Facebook, registrado en https://developers.facebook.com/apps" - facebook_request_extra_profile_details: "Solicitar sobre mí, localización y sitio web desde facebook. (requiere que tu aplicación de autenticación esté aprobada por facebook)" enable_github_logins: "Activar autenticación por Github, requiere una github_client_id y un github_client_secret" github_client_id: "Client id para la autenticación por Github, registrado en https://github.com/settings/applications" github_client_secret: "Client secret para la autenticación por Github, registrado en https://github.com/settings/applications" diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml index 786bba96d7d..2a396120143 100644 --- a/config/locales/server.fa_IR.yml +++ b/config/locales/server.fa_IR.yml @@ -925,7 +925,6 @@ fa_IR: enable_facebook_logins: "فعال کردن احراز هویت فیس‌بوک به facebook_app_id و facebook_app_secret نیار دارد" facebook_app_id: "App ID برای احراز هویت فیس بوک٬ که در https://developers.facebook.com/apps ایجاد شده" facebook_app_secret: "App secret برای احراز هویت فیس بوک، که در https://developers.facebook.com/apps ثبت شده" - facebook_request_extra_profile_details: "درخواست دربارهمن، موقعیت من و سایت من از فیسبوک‌ (نیازمند تایید برنامه شما توسط فیسبوک است)" enable_github_logins: "احراز هویت در Github را فعال کن، نیاز به github_client_id و github_client_secret" github_client_id: "Client ID برای احراز هویت در Github ٬ که در https://github.com/settings/applications ایجاد شده" github_client_secret: "Client secret را برای احراز هویت Github@که در https://github.com/settings/applications ایجاد شده" diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml index f19438a9417..0bf5edf07ec 100644 --- a/config/locales/server.fi.yml +++ b/config/locales/server.fi.yml @@ -999,7 +999,6 @@ fi: enable_facebook_logins: "Ota käyttöön Facebook autentikaatio, vaatimuksena facebook_app_id ja facebook_app_secret" facebook_app_id: "App id Facebook autentikaatioon, rekisteröinti osoitteessa https://developers.facebook.com/apps" facebook_app_secret: "App secret Facebook autentikaatioon, rekisteröinti osoitteessa https://developers.facebook.com/apps" - facebook_request_extra_profile_details: "Pyydä tietoa käyttäjästä, sijaintitieto ja internetsivu Facebookilta (vaatii Facebookin hyväksynnän)" enable_github_logins: "Ota käyttöön Gtihub autentikaatio, vaatimuksena github_client_id ja github_client_secret" github_client_id: "Client id Github autentikaatioon, rekisteröinti osoitteessa https://github.com/settings/applications" github_client_secret: "Client secret Github autentikaatioon, rekisteröinti osoitteessa https://github.com/settings/applications" diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index ed5eed46946..e725ff4eb35 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -1119,7 +1119,6 @@ fr: enable_facebook_logins: "Activer l'authentification Facebook, nécessite facebook_app_id et facebook_app_secret" facebook_app_id: "App id pour l'authentification Facebook, enregistré sur https://developers.facebook.com/apps" facebook_app_secret: "App secret pour l'authentification Facebook, enregistré sur https://developers.facebook.com/apps" - facebook_request_extra_profile_details: "Remplir les champs À propos de moi, Localisation et Site internet depuis Facebook (nécessite que votre application soit autorisée par Facebook)." enable_github_logins: "Activer l'authentification GitHub, nécessite github_client_id et github_client_secret" github_client_id: "Id client pour l'authentification Github, enregistré sur https://github.com/settings/applications" github_client_secret: "Secret client pour l'authentification Github, enregistré sur https://github.com/settings/applications" diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml index 5a82be18b6d..8356cfc1a5e 100644 --- a/config/locales/server.he.yml +++ b/config/locales/server.he.yml @@ -969,7 +969,6 @@ he: enable_facebook_logins: "איפשור אימות פייסבוק, מצריך facebook_app_id ו facebook_app_secret" facebook_app_id: "מזהה אפליקציה לאימות פייסבוק, רשום ב https://developers.facebook.com/apps" facebook_app_secret: "סוד אפליקציה לאימות פייסבוק, רשום ב https://developers.facebook.com/apps" - facebook_request_extra_profile_details: "בקשת מידע לגבי \"אודות\", מיקום, ואתר אינטרנט מפייסבוק. (מצריך שאפליקציית האימות שלכם תאושר על ידי פייסבוק)" enable_github_logins: "אפשור אימות Github, מצריך github_client_id ו github_client_secret" github_client_id: "מזהה לקוח לאימות Github, רשום ב https://github.com/settings/applications" github_client_secret: "סוד לקוח לאימות Github, רשום ב https://github.com/settings/applications" diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml index 5a7ab6849b3..01514113bea 100644 --- a/config/locales/server.it.yml +++ b/config/locales/server.it.yml @@ -997,7 +997,6 @@ it: enable_facebook_logins: "Abilita l'autenticazione via Facebook, richiede facebook_app_id e facebook_app_secret" facebook_app_id: "App id per autenticazione Facebook, come registrata su https://developers.facebook.com/apps" facebook_app_secret: "App secret per autenticazione Facebook, come registrata su https://developers.facebook.com/apps" - facebook_request_extra_profile_details: "Richiedi i miei dati, posizione e sito web da facebook (richiede che la tua applicazione auth sia approvata da facebook)." enable_github_logins: "Abilita l'autenticazione via Github, richiede github_client_id e github_client_secret" github_client_id: "Client id per autenticazione Github, come registrata su https://github.com/settings/applications" github_client_secret: "Client secret per autenticazione Github, come registrata su https://github.com/settings/applications" diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml index fa73fa0854a..f19582879dc 100644 --- a/config/locales/server.ko.yml +++ b/config/locales/server.ko.yml @@ -912,7 +912,6 @@ ko: enable_facebook_logins: "Facebook 인증을 활성화합니다. facebook_app_id와 facebook_app_secret 필요." facebook_app_id: "https://developers.facebook.com/apps에 등록된 Facebook 인증을 위한 App id" facebook_app_secret: "https://developers.facebook.com/apps에 등록된 Facebook 인증을 위한 App secret" - facebook_request_extra_profile_details: "Facebook에서 자기소개, 위치, 웹사이트를 요청(인증 어플리케이션이 Facebook으로부터 허가 받아야 함)" enable_github_logins: "Github 인증을 활성화한다. github_client_id와 github_client_secret 필요." github_client_id: "https://github.com/settings/applications에 등록된 Github 인증을 위한 Client id" github_client_secret: "https://github.com/settings/applications에 등록된 Github 인증을 위한 Client secret" diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml index fcf74b192df..fd8a4fc4dee 100644 --- a/config/locales/server.pl_PL.yml +++ b/config/locales/server.pl_PL.yml @@ -1058,7 +1058,6 @@ pl_PL: enable_facebook_logins: "Enable Facebook authentication, requires facebook_app_id and facebook_app_secret" facebook_app_id: "App id for Facebook authentication, registered at https://developers.facebook.com/apps" facebook_app_secret: "App secret for Facebook authentication, registered at https://developers.facebook.com/apps" - facebook_request_extra_profile_details: "Poproś o mnie, lokalizację i stronę z facebooka. (wymaga, aby twoja aplikacja autoryzacyjna była zaakceptowana przez Facebooka)" enable_github_logins: "Włacz autoryzację Github, wymagane github_client_id oraz github_client_secret" github_client_id: "Client id dla autoryzacji Github, zarejestrowany w https://github.com/settings/applications" github_client_secret: "Client secret dla autoryzacji Github, zarejestrowany w https://github.com/settings/applications" diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml index d1f3292025e..430e5e4a1ea 100644 --- a/config/locales/server.pt.yml +++ b/config/locales/server.pt.yml @@ -897,7 +897,6 @@ pt: enable_facebook_logins: "Ativar autenticação pelo Facebook, requer facebook_app_id e facebook_app_secret" facebook_app_id: "Id App usado para autenticação pelo Facebook, registado em https://developers.facebook.com/apps" facebook_app_secret: "Chave da App para autenticação com o Facebook, registado em https://developers.facebook.com/apps" - facebook_request_extra_profile_details: "Requerer informação sobre mim, localização e website do facebook. (requer que sua aplicação de autenticação esteja autorizada pelo facebook)" enable_github_logins: "Ativar autenticação via Github, requer github_client_id e github_client_secret" github_client_id: "Id do cliente para autenticação pelo Github, registado em https://github.com/settings/applications" github_client_secret: "Chave do Cliente para autenticação pelo Github, registado em https://github.com/settings/applications" diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml index 4c633af5874..a434da7b7d0 100644 --- a/config/locales/server.pt_BR.yml +++ b/config/locales/server.pt_BR.yml @@ -902,7 +902,6 @@ pt_BR: enable_facebook_logins: "Ativar autenticação pelo Facebook, requer facebook_app_id e facebook_app_secret" facebook_app_id: "app id, registrado em https://developers.facebook.com/apps (used for facebook auth)" facebook_app_secret: "app secret, registrado em https://developers.facebook.com/apps (used for facebook auth)" - facebook_request_extra_profile_details: "Solicitar sobre mim, localização e site do facebook. (requer que sua aplicação de autenticação seja aprovada pelo facebook)" enable_github_logins: "Ativar autenticação via Github, requer github_client_id e github_client_secret" github_client_id: "Client id para autenticação via Github, registrado em https://github.com/settings/applications" github_client_secret: "Client secret para autenticação via Github, registrado em https://github.com/settings/applications" diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml index 1eaddd47382..fd24357fc36 100644 --- a/config/locales/server.ro.yml +++ b/config/locales/server.ro.yml @@ -903,7 +903,6 @@ ro: enable_facebook_logins: "Activează autentificarea cu Facebook, necesită facebook_app_id și facebook_app_secret" facebook_app_id: "ID-ul aplicației pentru autentificarea cu Facebook, înregistrată la https://developers.facebook.com/apps" facebook_app_secret: "App secret pentru autentificarea cu Facebook, înregistrat la https://developers.facebook.com/apps" - facebook_request_extra_profile_details: "Solicită informațiile despre mine, locație și website de la Facebook. (necesită ca aplicația ta de autentificare să fie aprobată de Facebook)" enable_github_logins: "Activează autentificarea cu Github, requires github_client_id and github_client_secret" github_client_id: "ID client pentru autentificarea cu Github, înregistrat la https://github.com/settings/applications" github_client_secret: "Secretul clientului pentru autentificarea cu Github, înregistrat la https://github.com/settings/applications" diff --git a/config/locales/server.ur.yml b/config/locales/server.ur.yml index d744d2aa5bd..c0278edd391 100644 --- a/config/locales/server.ur.yml +++ b/config/locales/server.ur.yml @@ -1092,7 +1092,6 @@ ur: enable_facebook_logins: "فَیس بُک توثیق کو فعال کریں، facebook_app_id اور facebook_app_secret کی ضرورت ہے" facebook_app_id: "فَیس بُک توثیق کیلئے اَیپ آئی ڈی، https://developers.facebook.com/apps پر رجسٹر کردہ" facebook_app_secret: "فَیس بُک توثیق کیلئے اَیپ سیکرٹ، https://developers.facebook.com/apps پر رجسٹر کردہ" - facebook_request_extra_profile_details: "فَیس بُک سے میرے بارے میں، میرا محل وقوع اور میری ویب سائٹ کی درخواست کریں۔ (آپ کی توثیق اَیپلیکیشن، فَیس بُک سے منظور شدہ ہونے کی ضرورت ہوتی ہے)" enable_github_logins: "گِٹ ہَب توثیق کو فعال کریں، github_client_id اور github_client_secret کی ضرورت ہے" github_client_id: "گِٹ ہَب توثیق کیلئے کلائنٹ آئی ڈی، https://github.com/settings/applications پر رجسٹر کردہ" github_client_secret: "گِٹ ہَب توثیق کیلئے کلائنٹ سیکرٹ، https://github.com/settings/applications پر رجسٹر کردہ" diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index 8c815566146..11d5485c1c8 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -976,7 +976,6 @@ zh_CN: enable_facebook_logins: "启用 Facebook 帐号验证登录,需要 facebook_app_id 和 facebook_app_secret" facebook_app_id: "Facebook 帐号验证的应用帐号(App id),到 https://developers.facebook.com/apps 来注册获取" facebook_app_secret: "Facebook 帐号验证的应用密码(App secret),到 https://developers.facebook.com/apps 来注册获取" - facebook_request_extra_profile_details: "从 Facebook 中请求关于我、地点和网站。(需要 Facebook 许可你的登录应用)" enable_github_logins: "启用 Github 帐号验证登录,需要 github_client_id 和 github_client_secret" github_client_id: "Github 帐号验证的客户端帐号(Client id),到 https://github.com/settings/applications 来注册获取" github_client_secret: "Github 帐号验证的客户端密码(Client secret),到 https://github.com/settings/applications 来注册获取" diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml index 3cac79f7960..5b2966eab1e 100644 --- a/config/locales/server.zh_TW.yml +++ b/config/locales/server.zh_TW.yml @@ -881,7 +881,6 @@ zh_TW: enable_facebook_logins: "啟用臉書(Facebook)帳號驗證登入,需要 facebook_app_id 和 facebook_app_secret" facebook_app_id: "臉書帳號驗證的應用帳號(App id),到 https://developers.facebook.com/apps 來註冊獲取" facebook_app_secret: "臉書帳號驗證的應用密碼(App secret),到 https://developers.facebook.com/apps 來註冊獲取" - facebook_request_extra_profile_details: "從 Facebook 中請求關於我、地點和網站。(需要 Facebook 許可你的登錄應用)" enable_github_logins: "啟用 Github 帳號驗證登入,需要 github_client_id 和 github_client_secret" github_client_id: "Github 帳號驗證的用戶端帳號(Client id),到 https://github.com/settings/applications 來註冊獲取" github_client_secret: "Github 帳號驗證的用戶端密碼(Client secret),到 https://github.com/settings/applications 來註冊獲取" diff --git a/config/site_settings.yml b/config/site_settings.yml index 240ed2c05c0..3f5d4fa86d2 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -295,8 +295,6 @@ login: facebook_app_secret: default: '' regex: "^[a-f0-9]+$" - facebook_request_extra_profile_details: - default: false enable_github_logins: client: true default: false diff --git a/lib/auth/facebook_authenticator.rb b/lib/auth/facebook_authenticator.rb index f969c8dabf0..50e717d7395 100644 --- a/lib/auth/facebook_authenticator.rb +++ b/lib/auth/facebook_authenticator.rb @@ -57,9 +57,6 @@ class Auth::FacebookAuthenticator < Auth::Authenticator strategy.options[:client_id] = SiteSetting.facebook_app_id strategy.options[:client_secret] = SiteSetting.facebook_app_secret strategy.options[:info_fields] = 'gender,email,name,about,first_name,link,last_name,website,location' - if SiteSetting.facebook_request_extra_profile_details - strategy.options[:scope] = 'email,user_about_me,user_location,user_website' - end }, scope: "email" end