Skip to content

Commit

Permalink
Minor updates (#84)
Browse files Browse the repository at this point in the history
* Change tags admin locales #76

* Update articles wysiwyg to cdj_aude toolbar #77

* #79 Animator can see user details

* Update 'tendance' tag locale €48

* Update newsletter segments. closes #82

* Update welcome page feeds, closes #83

* Adds security.txt, closes #72
  • Loading branch information
clairezed committed Aug 11, 2018
1 parent 57f5279 commit 447af1e
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 0 deletions.
2 changes: 2 additions & 0 deletions config/application_custom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ class Application < Rails::Application
config.autoload_paths << "#{Rails.root}/app/helpers/custom"
end
end

require "./lib/custom/user_segments.rb"
3 changes: 3 additions & 0 deletions config/locales/custom/admin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ fr:
help: "Quand un utilisateur créé une projet, les thèmes suivants sont proposés comme tags par défaut."
name:
placeholder: Saisir le nom du tag
segment_recipient:
proposal_authors: Auteurs de projets
animators: Membres du CA
6 changes: 6 additions & 0 deletions config/locales/custom/general.yml
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,12 @@ fr:
spending_proposals:
not_verified: Seuls les utilisateurs vérifiés peuvent voter sur les projets; %{verify_account}.
welcome:
feed:
most_active:
debates: "Idées les plus actives"
proposals: "Projets les plus actifs"
see_all_debates: Voir toutes les idées
see_all_proposals: Voir tous les projets
debates:
description: Partage tes idées. Discutes-en avec les autres membres et donne ton avis sur les idées existantes. Si ton idée reçoit un certain nombre de like, elle sera étudiée pour devenir un projet
title: 1- Idée
Expand Down
17 changes: 17 additions & 0 deletions lib/custom/user_segments.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
require_dependency Rails.root.join('lib', 'user_segments').to_s

class UserSegments
SEGMENTS = %w(all_users
animators
administrators
proposal_authors
)

def self.animators
all_users.animators
end


private

end
1 change: 1 addition & 0 deletions public/.well-known/security.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Contact: [email protected]

0 comments on commit 447af1e

Please sign in to comment.