Merge pull request #793 from folio-org/lokalise_20190321T130117

Lokalise 20190321 t130117
folio-org · Apr 9, 2019 · 7f99776 · 7f99776
2 parents 1e2faf4 + fba3b1a
commit 7f99776
Show file tree

Hide file tree

Showing 20 changed files with 382 additions and 206 deletions.
diff --git a/src/Users.js b/src/Users.js
@@ -35,7 +35,7 @@ const filterConfig = [
     label: <FormattedMessage id="ui-users.information.patronGroup" />,
     name: 'pg',
     cql: 'patronGroup',
-    values: [], // will be filled in by componentWillUpdate
+    values: [], // will be filled in by componentDidUpdate
   },
 ];
 

diff --git a/src/components/BulkOverrideDialog/BulkOverrideInfo.js b/src/components/BulkOverrideDialog/BulkOverrideInfo.js
@@ -228,16 +228,16 @@ class BulkOverrideInfo extends React.Component {
         </Row>
         <Layout className="textRight">
           <Button
-            disabled={!canBeSubmitted}
-            onClick={this.submitOverride}
+            onClick={onCancel}
           >
-            <FormattedMessage id="ui-users.button.override" />
+            <FormattedMessage id="ui-users.cancel" />
           </Button>
           <Button
             buttonStyle="primary"
-            onClick={onCancel}
+            disabled={!canBeSubmitted}
+            onClick={this.submitOverride}
           >
-            <FormattedMessage id="ui-users.cancel" />
+            <FormattedMessage id="ui-users.button.override" />
           </Button>
         </Layout>
       </div>

diff --git a/src/components/Loans/OpenLoans/components/ActionsDropdown/ActionsDropdown.js b/src/components/Loans/OpenLoans/components/ActionsDropdown/ActionsDropdown.js
@@ -11,7 +11,6 @@ import {
   IconButton,
 } from '@folio/stripes/components';
 import {
-  IfPermission,
   stripesShape,
 } from '@folio/stripes/core';
 
@@ -49,7 +48,8 @@ class ActionsDropdown extends React.Component {
           data-role="menu"
           overrideStyle={{ padding: '7px 3px' }}
         >
-          <IfPermission perm="inventory.items.item.get">
+          {
+            stripes.hasPerm('inventory.items.item.get') &&
             <MenuItem itemMeta={{
               loan,
               action: 'itemDetails',
@@ -62,7 +62,7 @@ class ActionsDropdown extends React.Component {
                 <FormattedMessage id="ui-users.itemDetails" />
               </Button>
             </MenuItem>
-          </IfPermission>
+          }
           <MenuItem itemMeta={{
             loan,
             action: 'renew',

diff --git a/translations/ui-users/ar.json b/translations/ui-users/ar.json
@@ -796,5 +796,16 @@
     "transfers.columns.desc": "الوصف",
     "transfers.modalHeader": "حذف حساب التحويل",
     "transfers.singular": "حساب التحويل",
-    "transfers.nodata": "لا توجد رسوم/غرامات: حسابات التحويل"
+    "transfers.nodata": "لا توجد رسوم/غرامات: حسابات التحويل",
+    "payments.nodata": "لا توجد رسوم/غرامات: طرق السداد",
+    "details.button.new": "معلومات موظف جديد",
+    "accounts.cancelError": "ملغى كخطأ",
+    "accounts.comment.staffInfo": "معلومات موظف جديد",
+    "blocks.additionalReasons": "عرض تفاصيل الحظر لمعرفة المزيد من أسباب الحظر...",
+    "accounts.status.partially": "جزئيًا",
+    "accounts.status.fully": "بالكامل",
+    "accounts.actions.payment": "السداد",
+    "accounts.actions.waive": "الإعفاء",
+    "accounts.actions.tag.staff": "الموظفين",
+    "accounts.actions.tag.patron": "المستفيد"
 }
diff --git a/translations/ui-users/ca.json b/translations/ui-users/ca.json
@@ -492,8 +492,8 @@
     "charge.item.status": "Item Status",
     "charge.item.callNumber": "Call number",
     "charge.item.location": "Location",
-    "details.columns.comments": "Comments",
-    "details.columns.date": "Action Date",
+    "details.columns.comments": "Additional information",
+    "details.columns.date": "Action date",
     "details.columns.action": "Action",
     "details.columns.amount": "Amount",
     "details.columns.balance": "Balance",
@@ -544,19 +544,19 @@
     "accounts.history.columns.status": "Payment Status",
     "accounts.history.columns.due": "Due Date",
     "accounts.history.columns.returned": "Returned Date",
-    "accounts.pay.field.totalamount": "Total owed amount:",
-    "accounts.pay.field.selectedamount": "Selected amount:",
-    "accounts.pay.field.paymentamount": "Payment amount*",
-    "accounts.pay.field.remainingamount": "Remaining amount:",
-    "accounts.pay.field.paymentmethod": "Payment method*",
+    "accounts.pay.field.totalamount": "Total owed amount",
+    "accounts.pay.field.selectedamount": "Selected amount",
+    "accounts.pay.field.paymentamount": "Payment amount",
+    "accounts.pay.field.remainingamount": "Remaining amount",
+    "accounts.pay.field.paymentmethod": "Payment method",
     "accounts.pay.field.trasactioninfo": "Transaction information",
     "accounts.pay.field.comment": "Additional information",
     "accounts.waive.field.totalamount": "fees/fines for a total amount of",
-    "accounts.waive.field.totalowed": "Total owed amount:",
-    "accounts.waive.field.selectedamount": "Selected amount:",
-    "accounts.waive.field.waiveamount": "Waive amount*",
-    "accounts.waive.field.remainingamount": "Remaining amount:",
-    "accounts.waive.field.waivereason": "Waive reason*",
+    "accounts.waive.field.totalowed": "Total owed amount",
+    "accounts.waive.field.selectedamount": "Selected amount",
+    "accounts.waive.field.waiveamount": "Waive amount",
+    "accounts.waive.field.remainingamount": "Remaining amount",
+    "accounts.waive.field.waivereason": "Waive reason",
     "accounts.waive.field.comment": "Additional information",
     "accounts.waive.field.cancel": "Cancel",
     "accounts.waive.field.waive": "Waive",
@@ -582,7 +582,7 @@
     "charge.messageOf": " fee/fine Of ",
     "charge.messageSuccessfully": " has been successfully ",
     "charge.messageFor": " for ",
-    "details.columns.transactioninfo": "Transaction Information",
+    "details.columns.transactioninfo": "Transaction information",
     "details.paneTitle.feeFineDetails": "Fee/fine details",
     "details.label.loanDetails": "Loan details",
     "accounts.button.new": " New",
@@ -740,7 +740,7 @@
     "accounts.error.message": "Enter an amount greater than 0",
     "accounts.error.exceeds": "Pay amount exceeds the selected amount",
     "accounts.warning.itemSelected": "{total, number} items selected. {items, number} {items, plural, one {item} other {items}} cannot be {action} because they are already closed.",
-    "blocks.reason": "Reason for block:",
+    "blocks.reason": "Reason for block",
     "blocks.modal.header": "Patron blocked from renewing",
     "blocks.detailsButton": "Block details",
     "blocks.closeButton": "Close",
@@ -751,7 +751,7 @@
     "selectColumns": "Select Columns",
     "cddd.dateRequired": "Date*",
     "cddd.timeRequired": "Time*",
-    "additionalInfo.label": "Additional information*",
+    "additionalInfo.label": "Additional information",
     "additionalInfo.placeholder": "Enter more information about the override (required)",
     "button.override": "Override",
     "override.emptyNewDueDate": "Select due date above",
@@ -774,7 +774,7 @@
     "blocks.layer.newBlockTitle": "New Block",
     "accounts.totalOpenAccounts": "(Total: {amount})",
     "accounts.error.select": "Select one",
-    "accounts.pay.field.ownerDesk": "Fee/fine owner desk*",
+    "accounts.pay.field.ownerDesk": "Fee/fine owner desk",
     "accounts.pay.field.infoPatron": "Additional information for patron",
     "accounts.pay.owner.placeholder": "Select desk",
     "accounts.pay.method.placeholder": "Select type",
@@ -796,5 +796,16 @@
     "transfers.columns.desc": "Description",
     "transfers.modalHeader": "Delete transfer account",
     "transfers.singular": "Transfer account",
-    "transfers.nodata": "There are no Fee/fine: Transfer accounts"
+    "transfers.nodata": "There are no Fee/fine: Transfer accounts",
+    "payments.nodata": "There are no Fee/fine: Payment methods",
+    "details.button.new": "New staff info",
+    "accounts.cancelError": "Cancelled as Error",
+    "accounts.comment.staffInfo": "New staff info",
+    "blocks.additionalReasons": "View block details to see additional reasons for block...",
+    "accounts.status.partially": "partially",
+    "accounts.status.fully": "fully",
+    "accounts.actions.payment": "payment",
+    "accounts.actions.waive": "waive",
+    "accounts.actions.tag.staff": "STAFF",
+    "accounts.actions.tag.patron": "PATRON"
 }
diff --git a/translations/ui-users/da.json b/translations/ui-users/da.json
@@ -492,8 +492,8 @@
     "charge.item.status": "Item Status",
     "charge.item.callNumber": "Call number",
     "charge.item.location": "Location",
-    "details.columns.comments": "Comments",
-    "details.columns.date": "Action Date",
+    "details.columns.comments": "Additional information",
+    "details.columns.date": "Action date",
     "details.columns.action": "Action",
     "details.columns.amount": "Amount",
     "details.columns.balance": "Balance",
@@ -544,19 +544,19 @@
     "accounts.history.columns.status": "Payment Status",
     "accounts.history.columns.due": "Due Date",
     "accounts.history.columns.returned": "Returned Date",
-    "accounts.pay.field.totalamount": "Total owed amount:",
-    "accounts.pay.field.selectedamount": "Selected amount:",
-    "accounts.pay.field.paymentamount": "Payment amount*",
-    "accounts.pay.field.remainingamount": "Remaining amount:",
-    "accounts.pay.field.paymentmethod": "Payment method*",
+    "accounts.pay.field.totalamount": "Total owed amount",
+    "accounts.pay.field.selectedamount": "Selected amount",
+    "accounts.pay.field.paymentamount": "Payment amount",
+    "accounts.pay.field.remainingamount": "Remaining amount",
+    "accounts.pay.field.paymentmethod": "Payment method",
     "accounts.pay.field.trasactioninfo": "Transaction information",
     "accounts.pay.field.comment": "Additional information",
     "accounts.waive.field.totalamount": "fees/fines for a total amount of",
-    "accounts.waive.field.totalowed": "Total owed amount:",
-    "accounts.waive.field.selectedamount": "Selected amount:",
-    "accounts.waive.field.waiveamount": "Waive amount*",
-    "accounts.waive.field.remainingamount": "Remaining amount:",
-    "accounts.waive.field.waivereason": "Waive reason*",
+    "accounts.waive.field.totalowed": "Total owed amount",
+    "accounts.waive.field.selectedamount": "Selected amount",
+    "accounts.waive.field.waiveamount": "Waive amount",
+    "accounts.waive.field.remainingamount": "Remaining amount",
+    "accounts.waive.field.waivereason": "Waive reason",
     "accounts.waive.field.comment": "Additional information",
     "accounts.waive.field.cancel": "Cancel",
     "accounts.waive.field.waive": "Waive",
@@ -582,7 +582,7 @@
     "charge.messageOf": " fee/fine Of ",
     "charge.messageSuccessfully": " has been successfully ",
     "charge.messageFor": " for ",
-    "details.columns.transactioninfo": "Transaction Information",
+    "details.columns.transactioninfo": "Transaction information",
     "details.paneTitle.feeFineDetails": "Fee/fine details",
     "details.label.loanDetails": "Loan details",
     "accounts.button.new": " New",
@@ -740,7 +740,7 @@
     "accounts.error.message": "Enter an amount greater than 0",
     "accounts.error.exceeds": "Pay amount exceeds the selected amount",
     "accounts.warning.itemSelected": "{total, number} items selected. {items, number} {items, plural, one {item} other {items}} cannot be {action} because they are already closed.",
-    "blocks.reason": "Reason for block:",
+    "blocks.reason": "Reason for block",
     "blocks.modal.header": "Patron blocked from renewing",
     "blocks.detailsButton": "Block details",
     "blocks.closeButton": "Close",
@@ -751,7 +751,7 @@
     "selectColumns": "Select Columns",
     "cddd.dateRequired": "Date*",
     "cddd.timeRequired": "Time*",
-    "additionalInfo.label": "Additional information*",
+    "additionalInfo.label": "Additional information",
     "additionalInfo.placeholder": "Enter more information about the override (required)",
     "button.override": "Override",
     "override.emptyNewDueDate": "Select due date above",
@@ -774,7 +774,7 @@
     "blocks.layer.newBlockTitle": "New Block",
     "accounts.totalOpenAccounts": "(Total: {amount})",
     "accounts.error.select": "Select one",
-    "accounts.pay.field.ownerDesk": "Fee/fine owner desk*",
+    "accounts.pay.field.ownerDesk": "Fee/fine owner desk",
     "accounts.pay.field.infoPatron": "Additional information for patron",
     "accounts.pay.owner.placeholder": "Select desk",
     "accounts.pay.method.placeholder": "Select type",
@@ -796,5 +796,16 @@
     "transfers.columns.desc": "Description",
     "transfers.modalHeader": "Delete transfer account",
     "transfers.singular": "Transfer account",
-    "transfers.nodata": "There are no Fee/fine: Transfer accounts"
+    "transfers.nodata": "There are no Fee/fine: Transfer accounts",
+    "payments.nodata": "There are no Fee/fine: Payment methods",
+    "details.button.new": "New staff info",
+    "accounts.cancelError": "Cancelled as Error",
+    "accounts.comment.staffInfo": "New staff info",
+    "blocks.additionalReasons": "View block details to see additional reasons for block...",
+    "accounts.status.partially": "partially",
+    "accounts.status.fully": "fully",
+    "accounts.actions.payment": "payment",
+    "accounts.actions.waive": "waive",
+    "accounts.actions.tag.staff": "STAFF",
+    "accounts.actions.tag.patron": "PATRON"
 }
diff --git a/translations/ui-users/de.json b/translations/ui-users/de.json
@@ -492,8 +492,8 @@
     "charge.item.status": "Item Status",
     "charge.item.callNumber": "Call number",
     "charge.item.location": "Location",
-    "details.columns.comments": "Comments",
-    "details.columns.date": "Action Date",
+    "details.columns.comments": "Additional information",
+    "details.columns.date": "Action date",
     "details.columns.action": "Action",
     "details.columns.amount": "Amount",
     "details.columns.balance": "Balance",
@@ -544,19 +544,19 @@
     "accounts.history.columns.status": "Payment Status",
     "accounts.history.columns.due": "Due Date",
     "accounts.history.columns.returned": "Returned Date",
-    "accounts.pay.field.totalamount": "Total owed amount:",
-    "accounts.pay.field.selectedamount": "Selected amount:",
-    "accounts.pay.field.paymentamount": "Payment amount*",
-    "accounts.pay.field.remainingamount": "Remaining amount:",
-    "accounts.pay.field.paymentmethod": "Payment method*",
+    "accounts.pay.field.totalamount": "Total owed amount",
+    "accounts.pay.field.selectedamount": "Selected amount",
+    "accounts.pay.field.paymentamount": "Payment amount",
+    "accounts.pay.field.remainingamount": "Remaining amount",
+    "accounts.pay.field.paymentmethod": "Payment method",
     "accounts.pay.field.trasactioninfo": "Transaction information",
     "accounts.pay.field.comment": "Additional information",
     "accounts.waive.field.totalamount": "fees/fines for a total amount of",
-    "accounts.waive.field.totalowed": "Total owed amount:",
-    "accounts.waive.field.selectedamount": "Selected amount:",
-    "accounts.waive.field.waiveamount": "Waive amount*",
-    "accounts.waive.field.remainingamount": "Remaining amount:",
-    "accounts.waive.field.waivereason": "Waive reason*",
+    "accounts.waive.field.totalowed": "Total owed amount",
+    "accounts.waive.field.selectedamount": "Selected amount",
+    "accounts.waive.field.waiveamount": "Waive amount",
+    "accounts.waive.field.remainingamount": "Remaining amount",
+    "accounts.waive.field.waivereason": "Waive reason",
     "accounts.waive.field.comment": "Additional information",
     "accounts.waive.field.cancel": "Cancel",
     "accounts.waive.field.waive": "Waive",
@@ -582,7 +582,7 @@
     "charge.messageOf": " fee/fine Of ",
     "charge.messageSuccessfully": " has been successfully ",
     "charge.messageFor": " for ",
-    "details.columns.transactioninfo": "Transaction Information",
+    "details.columns.transactioninfo": "Transaction information",
     "details.paneTitle.feeFineDetails": "Fee/fine details",
     "details.label.loanDetails": "Loan details",
     "accounts.button.new": " New",
@@ -740,7 +740,7 @@
     "accounts.error.message": "Enter an amount greater than 0",
     "accounts.error.exceeds": "Pay amount exceeds the selected amount",
     "accounts.warning.itemSelected": "{total, number} items selected. {items, number} {items, plural, one {item} other {items}} cannot be {action} because they are already closed.",
-    "blocks.reason": "Reason for block:",
+    "blocks.reason": "Reason for block",
     "blocks.modal.header": "Patron blocked from renewing",
     "blocks.detailsButton": "Block details",
     "blocks.closeButton": "Close",
@@ -751,7 +751,7 @@
     "selectColumns": "Select Columns",
     "cddd.dateRequired": "Date*",
     "cddd.timeRequired": "Time*",
-    "additionalInfo.label": "Additional information*",
+    "additionalInfo.label": "Additional information",
     "additionalInfo.placeholder": "Enter more information about the override (required)",
     "button.override": "Override",
     "override.emptyNewDueDate": "Select due date above",
@@ -774,7 +774,7 @@
     "blocks.layer.newBlockTitle": "New Block",
     "accounts.totalOpenAccounts": "(Total: {amount})",
     "accounts.error.select": "Select one",
-    "accounts.pay.field.ownerDesk": "Fee/fine owner desk*",
+    "accounts.pay.field.ownerDesk": "Fee/fine owner desk",
     "accounts.pay.field.infoPatron": "Additional information for patron",
     "accounts.pay.owner.placeholder": "Select desk",
     "accounts.pay.method.placeholder": "Select type",
@@ -796,5 +796,16 @@
     "transfers.columns.desc": "Description",
     "transfers.modalHeader": "Delete transfer account",
     "transfers.singular": "Transfer account",
-    "transfers.nodata": "There are no Fee/fine: Transfer accounts"
+    "transfers.nodata": "There are no Fee/fine: Transfer accounts",
+    "payments.nodata": "There are no Fee/fine: Payment methods",
+    "details.button.new": "New staff info",
+    "accounts.cancelError": "Cancelled as Error",
+    "accounts.comment.staffInfo": "New staff info",
+    "blocks.additionalReasons": "View block details to see additional reasons for block...",
+    "accounts.status.partially": "partially",
+    "accounts.status.fully": "fully",
+    "accounts.actions.payment": "payment",
+    "accounts.actions.waive": "waive",
+    "accounts.actions.tag.staff": "STAFF",
+    "accounts.actions.tag.patron": "PATRON"
 }
diff --git a/translations/ui-users/en.json b/translations/ui-users/en.json
@@ -810,7 +810,7 @@
   "blocks.message":"patron block will be removed",
   "blocks.textField.place":"Patron has blocks in place",
 
-  "additionalInfo.label": "Additional information*",
+  "additionalInfo.label": "Additional information",
   "additionalInfo.placeholder": "Enter more information about the override (required)",
 
   "button.override": "Override",