From c60ee14b865964bfe3fee5a45b1694c8028ad2ad Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 23 Dec 2017 21:29:05 +0100
Subject: [PATCH] Better context for language strings.

---
 resources/lang/en_US/firefly.php                 | 7 +++----
 resources/views/admin/users/show.twig            | 4 +---
 resources/views/reports/partials/operations.twig | 4 ++--
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 69deb78c7f..388978bad3 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -819,8 +819,8 @@ return [
     'inactive'                                 => 'Inactive',
     'active'                                   => 'Active',
     'difference'                               => 'Difference',
-    'in'                                       => 'In',
-    'out'                                      => 'Out',
+    'money_flowing_in'                         => 'In',
+    'money_flowing_out'                        => 'Out',
     'topX'                                     => 'top :number',
     'show_full_list'                           => 'Show entire list',
     'show_only_top'                            => 'Show only top :number',
@@ -980,8 +980,7 @@ return [
     'total_size'                            => 'total size',
     'budget_or_budgets'                     => 'budget(s)',
     'budgets_with_limits'                   => 'budget(s) with configured amount',
-    'rule_or_rules'                         => 'rule(s)',
-    'rulegroup_or_groups'                   => 'rule group(s)',
+    'nr_of_rules_in_total_groups'           => ':count_rules rule(s) in :count_groups rule group(s)',
     'tag_or_tags'                           => 'tag(s)',
     'configuration_updated'                 => 'The configuration has been updated',
     'setting_is_demo_site'                  => 'Demo site',
diff --git a/resources/views/admin/users/show.twig b/resources/views/admin/users/show.twig
index 349e926811..a881d96da1 100644
--- a/resources/views/admin/users/show.twig
+++ b/resources/views/admin/users/show.twig
@@ -115,9 +115,7 @@
                         <tr>
                             <td>{{ trans('list.rule_and_groups_count') }}</td>
                             <td>
-                                {{ information.rules }} {{ 'rule_or_rules'|_ }} {{ 'in'|_ }} {{ information.rule_groups }}
-
-                                {{ 'rulegroup_or_groups'|_ }}
+                                {{ trans('firefly.nr_of_rules_in_total_groups', {count_rules: information.rules, count_groups: information.rule_groups}) }}
                             </td>
                         </tr>
                         <tr>
diff --git a/resources/views/reports/partials/operations.twig b/resources/views/reports/partials/operations.twig
index 60ee342bb9..ef501ba3a2 100644
--- a/resources/views/reports/partials/operations.twig
+++ b/resources/views/reports/partials/operations.twig
@@ -1,10 +1,10 @@
 <table class="table table-hover">
     <tr>
-        <td>{{ 'in'|_ }}</td>
+        <td>{{ 'money_flowing_in'|_ }}</td>
         <td style="text-align: right;">{{ incomeSum|formatAmount }}</td>
     </tr>
     <tr>
-        <td>{{ 'out'|_ }}</td>
+        <td>{{ 'money_flowing_out'|_ }}</td>
         <td style="text-align: right;">{{ expensesSum|formatAmount }}</td>
     </tr>
     <tr>