From b2e3703ae7ece6a12700ada30187befea4e1c677 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 25 Sep 2015 12:16:17 +1000 Subject: [PATCH] Revert "UX: always show logout link in user menu, use CSS to hide" oops was on wrong branch This reverts commit 2cbb49baec4ab66293c35c46cb4fdfa5cdb411e6. --- .../javascripts/discourse/templates/components/user-menu.hbs | 4 ++-- config/locales/server.ar.yml | 1 + config/locales/server.en.yml | 2 ++ config/locales/server.es.yml | 1 + config/locales/server.fr.yml | 1 + config/locales/server.he.yml | 1 + config/locales/server.pt.yml | 1 + config/locales/server.tr_TR.yml | 1 + config/locales/server.zh_CN.yml | 1 + config/site_settings.yml | 4 ++++ 10 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/components/user-menu.hbs b/app/assets/javascripts/discourse/templates/components/user-menu.hbs index e7247424b8a..0fa99d740ab 100644 --- a/app/assets/javascripts/discourse/templates/components/user-menu.hbs +++ b/app/assets/javascripts/discourse/templates/components/user-menu.hbs @@ -37,10 +37,10 @@ {{/conditional-loading-spinner}} {{plugin-outlet "user-menu-bottom"}} -
+ {{#if siteSettings.show_logout_in_header}}
-
+ {{/if}} {{/menu-panel}} diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml index f326044bc71..74f2f6b7269 100644 --- a/config/locales/server.ar.yml +++ b/config/locales/server.ar.yml @@ -1153,6 +1153,7 @@ ar: enable_cdn_js_debugging: "السماح/logs لعرض أخطاء المناسبة عن طريق إضافة تتضمن تحليل عرض كل شبيبة." show_create_topics_notice: "إذا كان الموقع يحتوي على أقل من 5 مواضيع عامة , إظهار إشعار مطالبة المسؤولين إنشاء بعض المواضيع." delete_drafts_older_than_n_days: حذف المسودات مضى عليها أكثر من (ن) يوما. + show_logout_in_header: "عرض تسجيل الخروج في القائمة المنسدلة للمستخدم في رأس الصفحة." vacuum_db_days: "شغل التحليل الكامل للمساحة لاستعادة مساحة DB بعد الهجرات (ضع 0 للإغلاق)" prevent_anons_from_downloading_files: "امنع المستخدمين المجهولين من تحميل المرفقات. تحذير:سوف تمنع اي شخص ليس لديه صوره موقع اصول نشره كمرفقات من العمل." slug_generation_method: "اختر طريقه توليد سبيكه . 'مشفره' سوف تقوم بتوليد سلسله مئويه مشفره.'لاشي' سوف يعطل السبيكه" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 47a8fd41ac7..94921497a9e 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1184,6 +1184,8 @@ en: delete_drafts_older_than_n_days: Delete drafts older than (n) days. + show_logout_in_header: "Show log out in user dropdown in header" + vacuum_db_days: "Run VACUUM FULL ANALYZE to reclaim DB space after migrations (set to 0 to disable)" prevent_anons_from_downloading_files: "Prevent anonymous users from downloading attachments. WARNING: this will prevent any non-image site assets posted as attachments from working." diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index 0465ce2dd26..385334271f4 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -1012,6 +1012,7 @@ es: enable_cdn_js_debugging: "Permitir /logs mostrar los errores correctamente, añadiendo permisos crossorigin en todas las inclusiones de js" show_create_topics_notice: "Si el sitio tiene menos de 5 temas abiertos al público, mostrar un aviso pidiendo a los administradores crear más temas." delete_drafts_older_than_n_days: Eliminar borradores de más de (n) días de antigüedad. + show_logout_in_header: "Mostrar el botón para cerrar sesión en el desplegable de la cabecera" vacuum_db_days: "Correr VACUUM FULL ANALYZE para reclamar espacio en la base de datos después de las migraciones. (Poner en 0 para inhabilitar)" prevent_anons_from_downloading_files: "Impedir que los usuarios anónimos descarguen archivos. ADVERTENCIA: Esto impedirá que funcione cualquier recurso del sitio publicado como adjunto." slug_generation_method: "Elegir un método de generación de slug. 'encoded' generará cadenas con código porciento. 'none' hara que no se genere slug." diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index 94a192fcb2f..0d25be8244c 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -1010,6 +1010,7 @@ fr: enable_cdn_js_debugging: "Autoriser /logs à afficher correctement les erreurs en ajoutant des permissions de crossorigin sur toutes les inclusions de js." show_create_topics_notice: "Si le site contient moins de 5 sujets publics, afficher un message pour demander aux administrateurs de créer d'autres sujets." delete_drafts_older_than_n_days: Supprimer les brouillons plus vieux que (n) jours. + show_logout_in_header: "Afficher le lien de déconnexion dans la liste utilisateur du header" vacuum_db_days: "Exécuter VACUUM FULL ANALYZE pour récupérer de l'espace dans la base de donnée après une migration (0 pour désactivé) " prevent_anons_from_downloading_files: "Refuser le téléchargement de pièces jointes aux utilisateurs anonymes. ATTENTION: cela empêchera de fonctionner les ressources envoyées en pièce jointe qui ne sont pas des images." slug_generation_method: "Choisissez une méthode de génération d'identifiant. \"encodé\" générera des chaines de caractères encodées avec des pourcentages. \"aucune\" désactivera complètement les identifiants." diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml index 4b5a4cb31c0..7cc94cc1f99 100644 --- a/config/locales/server.he.yml +++ b/config/locales/server.he.yml @@ -997,6 +997,7 @@ he: enable_cdn_js_debugging: "אפשרו ל-/logs להציג שגיאות בצורה נכונה באמצעות הוספת הרשאות לגישה בין אתרים (crossorigin permissions) בכל ה-js הכלולים." show_create_topics_notice: "אם לאתר פחות מ-5 נושאים פומביים, הציגו הודעה המבקשת מן המנהלים/מנהלות ליצור עוד נושאים." delete_drafts_older_than_n_days: Delete drafts older than (n) days. + show_logout_in_header: "Show log out in user dropdown in header" vacuum_db_days: "הריצו VACUUM FULL ANALYZE כדי להשיב שטח בסיס הנתונים אחרי העברות (כוונו ל-0 כדי לנטרל)" prevent_anons_from_downloading_files: "מונע ממשתמשים אנונימיים להוריד צרופות (attachments). אזהרה: דבר זה ימנע מכל משאב שאינו תמונה ופורסם כצרופה לעבוד." slug_generation_method: "Choose a slug generation method. 'encoded' will generate percent encoding string. 'none' will disable slug at all." diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml index e07d79bd068..19ff795b9f7 100644 --- a/config/locales/server.pt.yml +++ b/config/locales/server.pt.yml @@ -1025,6 +1025,7 @@ pt: enable_cdn_js_debugging: "Permitir que /logs exiba erros próprios ao adicionar permissões de origem-cruzada em todos os js incluídos." show_create_topics_notice: "Se o sítio tem menos de 5 tópicos públicos, mostrar um aviso pedindo aos administradores a criação de mais tópicos." delete_drafts_older_than_n_days: Eliminar rascunhos mais antigos que (n) days. + show_logout_in_header: "Mostrar Terminar Sessão no menu suspenso do utilizador no cabeçalho" vacuum_db_days: "Executar VACUUM FULL ANALYZE para reclamar espaço na Base de Dados após a migração (configurar a 0 para desativar)" prevent_anons_from_downloading_files: "Previna que utilizadores anónimos descarreguem anexos. AVISO: isto irá fazer com que quaisquer atributos (que não sejam imagens) publicados como anexos não funcionem." slug_generation_method: "Escolha um método de geração slug. 'encoded' irá gerar sequências de caracteres com código percentual. 'none' irá desativar slug por completo." diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml index e667c501b0d..b47160534cd 100644 --- a/config/locales/server.tr_TR.yml +++ b/config/locales/server.tr_TR.yml @@ -957,6 +957,7 @@ tr_TR: enable_cdn_js_debugging: "/logs 'ların asli hataları tüm js içeriklerine crossorigin izinleri ekleyerek göstermesine izin ver." show_create_topics_notice: "Eğer sitede herkese açık konu sayısı 5'den az ise, adminden yeni konular oluşturmasını isteyen bir uyarı mesajı göster. " delete_drafts_older_than_n_days: (n) günden eski taslakları sil. + show_logout_in_header: "Başlık çubuğundaki kullanıcı açılır listesinde oturumu kapatı göster" vacuum_db_days: "Geçiş sonra DB alanı geri kazanmak için TAM VAKUM ANALİZİ'ni çalıştırın (devre dışı bırakmak için 0 girin)" prevent_anons_from_downloading_files: "Anonim kullanıcıların eklenti indirebilmesini önle. DİKKAT: Bu ayar, eklenti olarak gönderilen resim-dışı site içeriklerinin de çalışmasını engelleyebilir." slug_generation_method: "Slug üretim yöntemi seçin. 'kodlanmış' seçeneği yüzde kodlamalı metin oluşturur. 'hiçbiri' seçeneği slug'ı devre dışı bırakır." diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index 41cfe0a7b20..0fed9c04997 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -988,6 +988,7 @@ zh_CN: enable_cdn_js_debugging: "为包含的 js 启动跨源访问 /logs 权限以显示合适的错误。" show_create_topics_notice: "如果站点只有少于 5 篇的公开帖子时，显示一条请管理员创建帖子的提示。" delete_drafts_older_than_n_days: 删除超过 n 天得草稿。 + show_logout_in_header: "在顶栏的用户下拉菜单中显示登出" vacuum_db_days: "在数据库迁移后使用完整扫描回收数据库空间（设置 0 为禁用）" prevent_anons_from_downloading_files: "禁止匿名用户下载附件。警告：这将禁止他们访问任何发表在帖子中的非图片资源。" slug_generation_method: "选择一个链接生成方式。“encoded”将生成以百分号编码的链接。“none”将禁用自定义链接，只生成默认链接。" diff --git a/config/site_settings.yml b/config/site_settings.yml index b818e4bb915..cff228d7d9b 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -978,6 +978,10 @@ uncategorized: default: -1 hidden: true + show_logout_in_header: + default: false + client: true + user_preferences: default_email_digest_frequency: enum: 'DigestEmailSiteSetting'