diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6 index 8a213ae8a4..6e5d5fc31f 100644 --- a/app/assets/javascripts/discourse/components/global-notice.js.es6 +++ b/app/assets/javascripts/discourse/components/global-notice.js.es6 @@ -14,10 +14,6 @@ export default Ember.Component.extend(StringBuffer, { notices.push([I18n.t("emails_are_disabled"), 'alert-emails-disabled']); } - if (this.siteSettings.enable_s3_uploads) { - notices.push([I18n.t("s3_deprecation_warning"), 'alert-s3-deprecation']); - } - if (Discourse.User.currentProp('admin') && this.siteSettings.show_create_topics_notice) { let topic_count = 0, post_count = 0; diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb index 90c573581b..bd18bb92eb 100644 --- a/app/models/admin_dashboard_data.rb +++ b/app/models/admin_dashboard_data.rb @@ -42,8 +42,7 @@ class AdminDashboardData title_check, site_description_check, site_contact_username_check, - notification_email_check, - s3_deprecation_warning + notification_email_check ].compact end @@ -182,8 +181,4 @@ class AdminDashboardData I18n.t('dashboard.ruby_version_warning') if RUBY_VERSION == '2.0.0' and RUBY_PATCHLEVEL < 247 end - def s3_deprecation_warning - I18n.t('dashboard.s3_deprecation_warning') if SiteSetting.enable_s3_uploads - end - end diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml index a35a388179..3b2148ec50 100644 --- a/config/locales/client.cs.yml +++ b/config/locales/client.cs.yml @@ -108,7 +108,6 @@ cs: email: 'odeslat odkaz emailem' topic_admin_menu: "akce administrátora tématu" emails_are_disabled: "Všechny odchozí emaily byly administrátorem vypnuty. Žádné odchozí emaily nebudou odeslány." - s3_deprecation_warning: "WARNING! Amazon S3 will soon be deprecated for image/attachment storage. Please, follow the instructions to migrate to local storage." edit: 'upravit název a kategorii příspěvku' not_implemented: "Tato fičura ještě není implementovaná" no_value: "Ne" diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml index 265acf8a3c..928b858c6d 100644 --- a/config/locales/client.da.yml +++ b/config/locales/client.da.yml @@ -92,7 +92,6 @@ da: email: 'send dette link i en e-mail' topic_admin_menu: "administrationshandlinger på emne" emails_are_disabled: "Alle udgående emails er blevet globalt deaktiveret af en administrator. Ingen email notifikationer af nogen slags vil blive sendt." - s3_deprecation_warning: "WARNING! Amazon S3 will soon be deprecated for image/attachment storage. Please, follow the instructions to migrate to local storage." edit: 'redigér titel og kategori for dette emne' not_implemented: "Beklager, denne feature er ikke blevet implementeret endnu." no_value: "Nej" diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index a58542e15e..0bae401b0f 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -105,8 +105,6 @@ en: emails_are_disabled: "All outgoing email has been globally disabled by an administrator. No email notifications of any kind will be sent." - s3_deprecation_warning: "WARNING! Amazon S3 will soon be deprecated for image/attachment storage. Please, follow the instructions to migrate to local storage." - edit: 'edit the title and category of this topic' not_implemented: "That feature hasn't been implemented yet, sorry!" no_value: "No" diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index 123189019e..b961a02554 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -92,7 +92,6 @@ es: email: 'comparte este enlace por email' topic_admin_menu: "acciones de administrador para el tema" emails_are_disabled: "Todos los emails salientes han sido desactivados por un administrador. No se enviará ninguna notificación por email." - s3_deprecation_warning: "¡AVISO! El almacenamiento para archivos adjuntos e imágenes en Amazon S3 quedará obsoleto. Por favor, sigue las instrucciones para trasladarlo a almacenamiento local." edit: 'editar el título y la categoría de este tema' not_implemented: "Esta característica no ha sido implementada aún, ¡lo sentimos!" no_value: "No" diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml index cad8f543f1..889b5ba07b 100644 --- a/config/locales/client.fa_IR.yml +++ b/config/locales/client.fa_IR.yml @@ -76,7 +76,6 @@ fa_IR: email: 'این پیوند را با ایمیل بفرستید' topic_admin_menu: "اقدامات مدیریت موضوع" emails_are_disabled: "تمام ایمیل های خروجی بصورت جهانی توسط مدیر قطع شده. هیچ ایمیل اخطاریه های ارسال نخواهد شد." - s3_deprecation_warning: "اخطار! آمازون S3 برای ذخیره سازی تصویر / فایل ضمیمه توصیه نمی شود. لطفا، به دنبال دستورالعمل ها و مهاجرت به ذخیره سازی محلی." edit: 'سرنویس و دستهٔ این موضوع را ویرایش کنید' not_implemented: "آن ویژگی هنوز به کار گرفته نشده، متأسفیم!" no_value: "نه" diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index c0bd4b05df..ab340185d6 100644 --- a/config/locales/client.fi.yml +++ b/config/locales/client.fi.yml @@ -92,7 +92,6 @@ fi: email: 'lähetä tämä linkki sähköpostissa' topic_admin_menu: "ketjun ylläpitotoimet" emails_are_disabled: "Ylläpitäjä on estänyt kaiken lähtevän sähköpostiliikenteen. Mitään sähköposti-ilmoituksia ei lähetetä." - s3_deprecation_warning: "VAROITUS! Kuvien ja liitetiedostojen tallentamisen Amazon S3-tuki lakkautetaan kohta. Ole hyvä ja seuraa ohjeita siirtyäksesi paikalliseen tallennukseen." edit: 'muokkaa tämän ketjun otsikkoa ja aluetta' not_implemented: "Tätä toimintoa ei ole vielä toteutettu, pahoittelut!" no_value: "Ei" diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml index 96af8f8016..78870c0101 100644 --- a/config/locales/client.he.yml +++ b/config/locales/client.he.yml @@ -92,7 +92,6 @@ he: email: 'שלח קישור בדוא"ל' topic_admin_menu: "פעולות ניהול לנושא" emails_are_disabled: "כל הדוא\"ל היוצא נוטרל באופן גורף על ידי מנהל אתר. שום הודעת דוא\"ל, מכל סוג שהוא, תשלח." - s3_deprecation_warning: "אזהרה! Amazon S3 יהיה בקרוב לא מומלץ לשימוש לאכסון צרופות/image. אנא עקבו אחר ההנחיות להעברה לאכסון מקומי." edit: 'ערוך את הכותרת והקטגוריה של הנושא' not_implemented: "סליחה, תכונה זו עדיין לא מומשה!" no_value: "לא" diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml index 359d6da195..bc809ec4a1 100644 --- a/config/locales/client.pt.yml +++ b/config/locales/client.pt.yml @@ -92,7 +92,6 @@ pt: email: 'enviar esta hiperligação por email' topic_admin_menu: "Ações administrativas dos Tópicos" emails_are_disabled: "Todos os envios de e-mail foram globalmente desativados por um administrador. Nenhum e-mail de notificação será enviado." - s3_deprecation_warning: "CUIDADO! O Amazon S3 irá tornar-se obsoleto para armazenamento de imagens/anexos. Por favor, siga as instruções para migrar para armazenamento local." edit: 'editar o título e a categoria deste tópico' not_implemented: "Essa funcionalidade ainda não foi implementada, pedimos desculpa!" no_value: "Não" diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml index ab371ee4ad..fea206e6e7 100644 --- a/config/locales/client.ru.yml +++ b/config/locales/client.ru.yml @@ -124,7 +124,6 @@ ru: email: 'поделиться ссылкой по почте' topic_admin_menu: "действия администратора над темой" emails_are_disabled: "Все исходящие письма были глобально отключены администратором. Уведомления любого вида не будут отправляться на почту." - s3_deprecation_warning: "ВНИМАНИЕ! Поддержка Amazon S3 для хранения изображений и вложений скоро будет отключена. Пожалуйста, следуйте инструкциям для миграции на локальное хранилище." edit: 'отредактировать название и раздел темы' not_implemented: "Извините, эта функция еще не реализована!" no_value: "Нет" diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml index fdae140b41..5e98e979b4 100644 --- a/config/locales/client.sq.yml +++ b/config/locales/client.sq.yml @@ -92,7 +92,6 @@ sq: email: 'dërgo këtë lidhje me email' topic_admin_menu: "topic admin actions" emails_are_disabled: "All outgoing email has been globally disabled by an administrator. No email notifications of any kind will be sent." - s3_deprecation_warning: "WARNING! Amazon S3 will soon be deprecated for image/attachment storage. Please, follow the instructions to migrate to local storage." edit: 'redakto titullin dhe kategorinë e kësaj teme' not_implemented: "Kjo veçori nuk është implementuar akoma, na vjen keq!" no_value: "Jo" diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml index dce74e7043..06cd746f50 100644 --- a/config/locales/client.sv.yml +++ b/config/locales/client.sv.yml @@ -92,7 +92,6 @@ sv: email: 'skicka denna länk i ett email' topic_admin_menu: "ämne admin åtgärder" emails_are_disabled: "Alla utgående email har blivit deaktiverad av en administratör. Inga kungörelser av någon sort kommer att bli skickad." - s3_deprecation_warning: "VARNING! Stödet för Amazon S3-lagring av bilder/bilagor kommer snart överges. Följ instruktionerna för migrering till lokal lagring." edit: 'redigera titel och kategori för denna tråd' not_implemented: "Denna funktion har inte implementerats än, vi beklagar!" no_value: "Nej" diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml index a9ad3fe1cf..c2f7b40c81 100644 --- a/config/locales/server.de.yml +++ b/config/locales/server.de.yml @@ -600,7 +600,6 @@ de: consumer_email_warning: "Deine Seite verwendet Gmail (oder einen anderen für Endkunden gedachten Mailserver) um E-Mails zu versenden. Gmail hat eine Schranke bezüglich des Sendens von E-Mails. Um die E-Mail-Zustellung zu gewährleisten, solltest du die Verwendung eines anderen E-Mail-Diensts in Erwägung ziehen." site_contact_username_warning: "Gib den Namen des Benutzerkontos eines freundlichen Mitarbeiters an, der als Absender für wichtige automatische Nachrichten verwendet wird. Aktualisiere site_contact_username in den Website-Einstellungen." notification_email_warning: "Benachrichtigungs-E-Mails werden nicht von einer gültigen, zu deiner Domain gehörenden E-Mail-Adresse versandt; der E-Mail-Versand wird unberechenbar und unzuverlässig sein. Bitte trage in den Einstellungen unter notification_email eine gültige lokale E-Mail-Adresse ein." - s3_deprecation_warning: "ACHTUNG! Nutzung von Amazon S3 für die Speicherung von Bildern/Anhängen wird bald nicht mehr empfohlen. Bitte folge dieser Anleitung um auf lokale Speicherung umzusteigen." content_types: education_new_reply: title: "Hilfe: Erste Beiträge" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 8fba30e700..659d8201ae 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -700,7 +700,6 @@ en: consumer_email_warning: "Your site is configured to use Gmail (or another consumer email service) to send email. Gmail limits how many emails you can send. Consider using an email service provider like mandrill.com to ensure email deliverability." site_contact_username_warning: "Enter the name of a friendly staff user account to send important automated messages from. Update site_contact_username in Site Settings." notification_email_warning: "Notification emails are not being sent from a valid email address on your domain; email delivery will be erratic and unreliable. Please set notification_email to a valid local email address in Site Settings." - s3_deprecation_warning: "WARNING! Amazon S3 will soon be deprecated for image/attachment storage. Please, follow the instructions to migrate to local storage." content_types: education_new_reply: diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index 011f38dfb2..ca2bdb7ed8 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -613,7 +613,6 @@ es: consumer_email_warning: "Tu sitio está configurado para Utilizar Gmail (u otro servicio de email de consumidor) para enviar email. Gmail limita la cantidad de emails que puedes enviar. Considera usar un proveedor de servicio email como mandrill.com para asegurarte la entrega de los emails." site_contact_username_warning: "Introduce el nombre de un administrador o moderador simpático desde el cual se enviarán mensajes automáticos importantes. Actualiza site_contact_username en Ajustes del sitio." notification_email_warning: "Las notificaciones por email no están siendo enviadas desde una dirección de correo electrónico válida en tu dominio; la entrega de emails será errática y poco fiable. Por favor, establece para notification_email una dirección de correo electrónico local válida en Ajustes del sitio." - s3_deprecation_warning: "¡AVISO! El almacenamiento para archivos adjuntos e imágenes en Amazon S3 quedará obsoleto. Por favor, sigue las instrucciones para trasladarlo a almacenamiento local." content_types: education_new_reply: title: "Educación de nuevo usuario: primeras respuestas" diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml index a081ea65de..261a9190ff 100644 --- a/config/locales/server.he.yml +++ b/config/locales/server.he.yml @@ -599,7 +599,6 @@ he: consumer_email_warning: "Your site is configured to use Gmail (or another consumer email service) to send email. Gmail limits how many emails you can send. Consider using an email service provider like mandrill.com to ensure email deliverability." site_contact_username_warning: "הזינו שם חשבון ידידותי של אי/אשת צות ממנו ישלחו הודעות אוטומטיות חשובות. עדכנו את site_contact_username בהגדרות האתר." notification_email_warning: "מיילים ליידוע אינם נשלחים מכתובת תקינה בדומיין שלכם; משלוח דוא\"ל יהיה בעייתי ולא אמין. אנא כוונו את כתובת המייל למשלוח התראות לכתובת מקומית תקינה בהגדרות האתר." - s3_deprecation_warning: "אזהרה! Amazon S3 יהיה בקרוב לא מומלץ לשימוש לאכסון צרופות/image. אנא עקבו אחר ההנחיות להעברה לאכסון מקומי." content_types: education_new_reply: title: "New User Education: First Replies" diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml index deb9bf99e1..b10c57eccc 100644 --- a/config/locales/server.pt.yml +++ b/config/locales/server.pt.yml @@ -616,7 +616,6 @@ pt: consumer_email_warning: "O seu sítio está configurado para usar Gmail (ou outro serviço de email)O Gmail limita a quantidade de emails que pode enviar. Considere usar um serviço de envio de emails como mandrill.com para assegurar a entregabilidade dos emails enviados." site_contact_username_warning: "Introduza o nome de uma conta de utilizador de um membro do pessoal de onde possam ser enviadas mensagens importantes automatizadas. Atualize sítio_contato_nomedeutilizador nas Configurações do Sítio." notification_email_warning: "Não estão a ser enviados emails de notificação a partir de um endereço de email válido no seu domínio; a entrega do email será errática e não fiável. Por favor configure notificaçao_email para um endereço de email local válido nas Configurações do Sítio." - s3_deprecation_warning: "AVISO! O Amazon S3 irá tornar-se obsoleto brevemente para armazenamento de imagens/anexos. Por favor, siga as instruções para migrar para armazenamento local." content_types: education_new_reply: title: "Educação do Novo Utilizador: Primeiras Respostas" diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml index 9d962ce6fe..908d6afa3d 100644 --- a/config/locales/server.pt_BR.yml +++ b/config/locales/server.pt_BR.yml @@ -610,7 +610,6 @@ pt_BR: consumer_email_warning: "Seu site está configurado para usar Gmail (ou outro serviço de email para pessoas). Gmail limita a quantidade de emails que você pode enviar. Considere o uso de um serviço de envio de emails como mandrill.com para assegurar a entregabilidade dos emails enviados." site_contact_username_warning: "Digite o nome de um membro interno para enviar mensagens importantes automaticamente a partir dele. Atualize site_contact_username em Configurações do Site." notification_email_warning: "Emails de notificação não estão sendo enviados por um endereço de email válido no seu domínio; entrega de email será errática e não confiável. Por favor configure notification_email com um endereço de email local válido nas Configurações do Site." - s3_deprecation_warning: "AVISO! Amazon S3 logo se tornará obsoleto para armazenamento de imagem/anexo. Por favor, siga as istruções para migrar o armazenamento local." content_types: education_new_reply: title: "Educação do Usuário Novo: Primeiras Respostas" diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml index 139b0da9b5..366208e55e 100644 --- a/config/locales/server.sq.yml +++ b/config/locales/server.sq.yml @@ -608,7 +608,6 @@ sq: consumer_email_warning: "Your site is configured to use Gmail (or another consumer email service) to send email. Gmail limits how many emails you can send. Consider using an email service provider like mandrill.com to ensure email deliverability." site_contact_username_warning: "Enter the name of a friendly staff user account to send important automated messages from. Update site_contact_username in Site Settings." notification_email_warning: "Notification emails are not being sent from a valid email address on your domain; email delivery will be erratic and unreliable. Please set notification_email to a valid local email address in Site Settings." - s3_deprecation_warning: "WARNING! Amazon S3 will soon be deprecated for image/attachment storage. Please, follow the instructions to migrate to local storage." content_types: education_new_reply: title: "New User Education: First Replies" diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml index 126d8a23cd..4c004bdd52 100644 --- a/config/locales/server.tr_TR.yml +++ b/config/locales/server.tr_TR.yml @@ -560,7 +560,6 @@ tr_TR: consumer_email_warning: "Sitenizde e-posta gönderimleri için Gmail (ya da başka bir e-posta hizmeti) kurulumu yapılmış. Gmail ile gönderebileceğiniz e-posta sayısı limitlidir. Onun yerine, e-postalarınızın ulaştırılabildiğinden emin olmak için mandrill.com benzeri bir hizmet sağlayıcısını kullanın." site_contact_username_warning: "Önemli otomatik mesajları gönderen kişi olarak gözükecek adminin kullanıcı adını girin. Site Ayarları&lt;/a> sayfasından site_contact_username parametresini güncelleyin." notification_email_warning: "Bildiri e-postaları alan adınıza bağlı geçerli bir e-posta adresinden yollanmıyor; e-postalar düzenli ve güvenilir bir şekilde ulaşmayabilir. Lütfen Site Ayarları sayfasından notification_email değeri için geçerli bir yerel e-posta adresi girin." - s3_deprecation_warning: "DİKKAT! Resim/eklenti depolama için Amazon S3 kullanımı yakında ıskartaya kaldırılacaktır. Lütfen, talimatlara uyarak yerel depolamaya geçiş yapınız." content_types: education_new_reply: title: "Yeni Kullanıcı Eğitimi: İlk Cevaplar" diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index 9cf2b60e78..d6a534c2bc 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -589,7 +589,6 @@ zh_CN: consumer_email_warning: "你的站点被设置为使用 Gmail 或者其他客户邮箱服务发送邮件。Gmail 限制每日邮件发送数量。请考虑使用其他邮件服务商来保证邮件的成功发送，例如 mandrill.com。" site_contact_username_warning: "输入一个友善的职员账户名，并以他的名义发送重要的自动消息。在站点设置中更新 site_contact_username。" notification_email_warning: "通知邮件不是从你域名的一个有效地址发出的；邮件分发将会变得危险和不可靠。请在站点设置中将 notification_email 设置为一个有效的本地邮件地址。" - s3_deprecation_warning: "警告！Amazon S3 将不再能作为图片/附件存储区了。请按照指引迁移至本地存储。" content_types: education_new_reply: title: "新用户培训：第一个回复" diff --git a/spec/models/admin_dashboard_data_spec.rb b/spec/models/admin_dashboard_data_spec.rb index 794910ff02..d26d088300 100644 --- a/spec/models/admin_dashboard_data_spec.rb +++ b/spec/models/admin_dashboard_data_spec.rb @@ -244,20 +244,4 @@ describe AdminDashboardData do end end - describe 's3_deprecation_warning' do - subject { described_class.new.s3_deprecation_warning } - - it 'returns nil when using local storage' do - SiteSetting.stubs(:enable_s3_uploads).returns(false) - ENV.stubs(:[]).with('RUBY_GC_MALLOC_LIMIT').returns(90000000) - expect(subject).to be_nil - end - - it 'returns a string when s3 storage' do - SiteSetting.stubs(:enable_s3_uploads).returns(true) - expect(subject).to_not be_nil - end - - end - end