Merge branch 'release/0.27-stable' of github.com:alecslupu-pfa/decidi…

…m-budget_category_voting

config/locales/en.yml

@@ -15,10 +15,8 @@ en:
         form:
           attributes:
             category_budget_rules:
-              minimum_budget_projects_number_too_high: The minimum number of projects
-                is too high.
-              minimum_budget_projects_number_too_low: The minimum number of projects
-                is too low.
+              minimum_budget_projects_number_too_high: The minimum number of projects is too high.
+              minimum_budget_projects_number_too_low: The minimum number of projects is too low.
               percent_number_too_high: The computed percentage is too high.
               percent_number_too_low: The percentage is too low.
   decidim:
@@ -35,56 +33,34 @@ en:
       assigned: Assigned %{total}
       budget_excess:
         budget_excess:
-          description_html: This project exceeds the maximum budget and can not be
-            added. If you want, you can delete a project you have already selected,
-            in order to be able to vote again according to your preferences.
+          description_html: This project exceeds the maximum budget and can not be added. If you want, you can delete a project you have already selected, in order to be able to vote again according to your preferences.
           title_html: Maximum budget exceeded for <strong>%{category}</strong>
         projects_excess:
-          description_html: This project exceeds the maximum number of projects and
-            cannot be added. If you want, you can delete a project you have already
-            selected, in order to be able to vote again according to your preferences.
+          description_html: This project exceeds the maximum number of projects and cannot be added. If you want, you can delete a project you have already selected, in order to be able to vote again according to your preferences.
           title_html: Maximum projects exceeded for <strong>%{category}</strong>
       criteria_met: Criteria met
       criteria_not_met: Criteria not met
       minimum_projects_rule:
-        description_html: What projects from <strong>%{category}</strong> category
-          do you think we should allocate budget for? Select at least %{minimum_number}
-          projects you want and vote according to your preferences to define the budget.
+        description_html: What projects from <strong>%{category}</strong> category do you think we should allocate budget for? Select at least %{minimum_number} projects you want and vote according to your preferences to define the budget.
         inline_criteria_html: Minimum %{minimum_number}
-        instruction_html: "<li>Select at least %{minimum_number} projects belonging
-          to <strong>%{category}</strong> you want and vote according to your preferences
-          to define the budget.</li>"
+        instruction_html: "<li>Select at least %{minimum_number} projects belonging to <strong>%{category}</strong> you want and vote according to your preferences to define the budget.</li>"
       projects_rule:
-        description_html: What projects from <strong>%{category}</strong> category
-          do you think we should allocate budget for? Select at least %{minimum_number}
-          and up to %{maximum_number} projects you want and vote according to your
-          preferences to define the budget.
+        description_html: What projects from <strong>%{category}</strong> category do you think we should allocate budget for? Select at least %{minimum_number} and up to %{maximum_number} projects you want and vote according to your preferences to define the budget.
         inline_criteria_html: Minimum %{minimum_number} and maximum %{maximum_number}
-        instruction_html: "<li>Select at least %{minimum_number} and up to %{maximum_number}
-          projects belonging to <strong>%{category}</strong> you want and vote according
-          to your preferences to define the budget.</li>"
+        instruction_html: "<li>Select at least %{minimum_number} and up to %{maximum_number} projects belonging to <strong>%{category}</strong> you want and vote according to your preferences to define the budget.</li>"
       projects_rule_maximum_only:
-        description_html: What projects from <strong>%{category}</strong> category
-          do you think we should allocate budget for? Select up to %{maximum_number}
-          projects you want and vote according to your preferences to define the budget.
+        description_html: What projects from <strong>%{category}</strong> category do you think we should allocate budget for? Select up to %{maximum_number} projects you want and vote according to your preferences to define the budget.
         inline_criteria_html: Maximum %{maximum_number}
-        instruction_html: "<li>Select up to %{maximum_number} projects belonging to
-          <strong>%{category}</strong> you want and vote according to your preferences
-          to define the budget.</li>"
+        instruction_html: "<li>Select up to %{maximum_number} projects belonging to <strong>%{category}</strong> you want and vote according to your preferences to define the budget.</li>"
       rule:
         available_votes: Votes that can be assigned
         remaining_budget: Remaining budget
         remaining_votes: Required votes
         required_votes: Votes required to assign
       vote_threshold_percent_rule:
-        description_html: What projects from <strong>%{category}</strong> category
-          do you think we should allocate budget for? Assign at least %{minimum_budget}
-          to the projects you want and vote according to your preferences to define
-          the budget.
+        description_html: What projects from <strong>%{category}</strong> category do you think we should allocate budget for? Assign at least %{minimum_budget} to the projects you want and vote according to your preferences to define the budget.
         inline_criteria_html: Minimum %{minimum_budget}
-        instruction_html: "<li>Assign at least %{minimum_budget} to the projects  belonging
-          to <strong>%{category}</strong> you want and vote according to your preferences
-          to define the budget.</li>"
+        instruction_html: "<li>Assign at least %{minimum_budget} to the projects  belonging to <strong>%{category}</strong> you want and vote according to your preferences to define the budget.</li>"
     components:
       budget_category_voting:
         name: BudgetCategoryVoting

config/locales/fr.yml

@@ -6,12 +6,12 @@ fr:
         budget:
           attributes:
             category_budget_rules:
-              duplicate: Duplicate category set within rules. Please review.
+              duplicate: Une seule catégorie a eu deux règles assignées. Une catégorie ne peut avoir qu'une seule règle.
               invalid: Règles de budget par catégorie non valides. Veuillez revoir les configurations.
         category_budget_rule:
           attributes:
             decidim_category_id:
-              duplicate: There is already another rule for this category.
+              duplicate: Il existe déjà une autre règle pour cette catégorie.
         form:
           attributes:
             category_budget_rules:
@@ -30,21 +30,27 @@ fr:
         form:
           add: Ajouter
           category_budget_rules: Règles budgétaires de la catégorie
+      assigned: '%{total} assigné'
       budget_excess:
         budget_excess:
           description_html: Ce projet dépasse le budget maximum et ne peut pas être ajouté. Si vous le souhaitez, vous pouvez supprimer un projet que vous avez déjà sélectionné puis voter de nouveau selon vos préférences.
           title_html: Budget maximal dépassé pour la catégorie <strong>%{category}</strong>
         projects_excess:
           description_html: Ce projet dépasse le nombre maximum de projets et ne peut pas être ajouté. Si vous le souhaitez, vous pouvez supprimer un projet que vous avez déjà sélectionné puis voter de nouveau selon vos préférences.
           title_html: Budget maximal dépassé pour la catégorie <strong>%{category}</strong>
+      criteria_met: Critères remplis
+      criteria_not_met: Critères non remplis
       minimum_projects_rule:
         description_html: Pour quels projets de la catégorie <strong>%{category}</strong> pensez-vous que nous devrions allouer le budget ? Sélectionnez au moins %{minimum_number} projets que vous souhaitez et votez en fonction de vos préférences pour définir le budget.
+        inline_criteria_html: Minimum %{minimum_number}
         instruction_html: "<li>Sélectionnez au moins %{minimum_number} projets appartenant à la catégorie <strong>%{category}</strong></li>"
       projects_rule:
         description_html: Pour quels projets de la catégorie <strong>%{category}</strong> pensez-vous que nous devrions allouer le budget ? Sélectionnez au moins %{minimum_number} projets que vous souhaitez et votez en fonction de vos préférences pour définir le budget.
+        inline_criteria_html: Minimum %{minimum_number} et maximum %{maximum_number}
         instruction_html: "<li>Sélectionnez au moins %{minimum_number} et au plus %{maximum_number} projets appartenant à la catégorie <strong>%{category}</strong></li>"
       projects_rule_maximum_only:
         description_html: Pour quels projets de la catégorie <strong>%{category}</strong> pensez-vous que nous devrions allouer le budget ? Sélectionnez au moins %{maximum_number} projets que vous souhaitez et votez en fonction de vos préférences pour définir le budget.
+        inline_criteria_html: Maximum %{maximum_number}
         instruction_html: "<li>Sélectionnez au plus %{maximum_number} projets appartenant à la catégorie <strong>%{category}</strong></li>"
       rule:
         available_votes: Votes qui peuvent être assignés
@@ -53,6 +59,7 @@ fr:
         required_votes: Votes requis
       vote_threshold_percent_rule:
         description_html: Pour quels projets de la catégorie <strong>%{category}</strong> pensez-vous que nous devrions allouer le budget ? Sélectionnez au moins %{minimum_budget} projets que vous souhaitez et votez en fonction de vos préférences pour définir le budget.
+        inline_criteria_html: Minimum %{minimum_budget}
         instruction_html: "<li>Sélectionnez au moins %{minimum_budget} projets appartenant à la catégorie <strong>%{category}</strong></li>"
     components:
       budget_category_voting:

config/locales/ro.yml

@@ -30,21 +30,27 @@ ro:
         form:
           add: Add
           category_budget_rules: Category budget rules
+      assigned: Assigned %{total}
       budget_excess:
         budget_excess:
           description_html: This project exceeds the maximum budget and can not be added. If you want, you can delete a project you have already selected, in order to be able to vote again according to your preferences.
           title_html: Maximum budget exceeded for <strong>%{category}</strong>
         projects_excess:
           description_html: This project exceeds the maximum number of projects and cannot be added. If you want, you can delete a project you have already selected, in order to be able to vote again according to your preferences.
           title_html: Maximum projects exceeded for <strong>%{category}</strong>
+      criteria_met: Criteria met
+      criteria_not_met: Criteria not met
       minimum_projects_rule:
         description_html: What projects from <strong>%{category}</strong> category do you think we should allocate budget for? Select at least %{minimum_number} projects you want and vote according to your preferences to define the budget.
+        inline_criteria_html: Minimum %{minimum_number}
         instruction_html: "<li>Select at least %{minimum_number} projects belonging to <strong>%{category}</strong> you want and vote according to your preferences to define the budget.</li>"
       projects_rule:
         description_html: What projects from <strong>%{category}</strong> category do you think we should allocate budget for? Select at least %{minimum_number} and up to %{maximum_number} projects you want and vote according to your preferences to define the budget.
+        inline_criteria_html: Minimum %{minimum_number} and maximum %{maximum_number}
         instruction_html: "<li>Select at least %{minimum_number} and up to %{maximum_number} projects belonging to <strong>%{category}</strong> you want and vote according to your preferences to define the budget.</li>"
       projects_rule_maximum_only:
         description_html: What projects from <strong>%{category}</strong> category do you think we should allocate budget for? Select up to %{maximum_number} projects you want and vote according to your preferences to define the budget.
+        inline_criteria_html: Maximum %{maximum_number}
         instruction_html: "<li>Select up to %{maximum_number} projects belonging to <strong>%{category}</strong> you want and vote according to your preferences to define the budget.</li>"
       rule:
         available_votes: Votes that can be assigned
@@ -53,6 +59,7 @@ ro:
         required_votes: Votes required to assign
       vote_threshold_percent_rule:
         description_html: What projects from <strong>%{category}</strong> category do you think we should allocate budget for? Assign at least %{minimum_budget} to the projects you want and vote according to your preferences to define the budget.
+        inline_criteria_html: Minimum %{minimum_budget}
         instruction_html: "<li>Assign at least %{minimum_budget} to the projects  belonging to <strong>%{category}</strong> you want and vote according to your preferences to define the budget.</li>"
     components:
       budget_category_voting: