Merge pull request #494 from sussol/Minor-localisation-and-visual

Minor localisation and visual tweaks
msupply-foundation · Aug 21, 2017 · 394c0a0 · 394c0a0
2 parents 9f1d7bb + a800f99
commit 394c0a0
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 15 deletions.
diff --git a/src/localization/buttonStrings.js b/src/localization/buttonStrings.js
@@ -12,6 +12,7 @@ export const buttonStrings = new LocalizedStrings({
     all_items_selected: 'All Items Selected',
     create_automatic_order: 'Create Automatic Order',
     current: 'Current',
+    done: 'Done',
     hide_stockouts: 'Hide Stockouts',
     manage_stocktake: 'Manage Stocktake',
     new_invoice: 'New Invoice',
@@ -23,7 +24,7 @@ export const buttonStrings = new LocalizedStrings({
     use_suggested_quantities: 'Use Suggested Quantities',
     use_requested_quantities: 'Use Requested Quantities',
   },
-  gil: {  // TODO: use_requested_quantities, new_supplier_invoice, add_batch
+  gil: {  // TODO: use_requested_quantities, new_supplier_invoice, add_batch, done
     add_master_list_items: 'Rinea am list',
     all_items_selected: 'Aikai nikabane',
     create_automatic_order: 'Create Automatic Order',
@@ -37,12 +38,13 @@ export const buttonStrings = new LocalizedStrings({
     past: 'Are I mwaina',
     use_suggested_quantities: 'Kabongana te\nmwaiti are e katauaki',
   },
-  tl: { // TODO: use_requested_quantities
+  tl: {
     add_batch: 'Linha Foun',
     add_master_list_items: 'Utiliza Lista Master',
     all_items_selected: 'Hili Item Hotu',
     create_automatic_order: 'Kria Orden Automátiku',
     current: 'Atuál',
+    done: 'Hotu',
     hide_stockouts: 'Hili item ho Qtd ejiste',
     manage_stocktake: 'Maneja Ajustamentu',
     new_invoice: 'Invoice Foun',

diff --git a/src/localization/tableStrings.js b/src/localization/tableStrings.js
@@ -122,9 +122,9 @@ export const tableStrings = new LocalizedStrings({
     required_quantity: 'QTD.\nHUSU/EZIJE',
     requisition_number: 'NÚMERU REKUIZISAUN',
     selected: 'SELESIONA',
-    snapshot_quantity: 'Qtd. IHA ARMAZEN',
+    snapshot_quantity: 'QTD. IHA\nARMAZEN',
     status: 'ESTATUS',
-    stock_on_hand: 'Qtd. IHA ARMAZEN',
+    stock_on_hand: 'QTD. IHA\nARMAZEN',
     suggested_quantity: 'QTD.\nSUJERE',
     supplier: 'Distribuidor',
     supply_quantity: 'KUANTIDADE\nDISTRIBUI',

diff --git a/src/pages/CustomerInvoicesPage.js b/src/pages/CustomerInvoicesPage.js
@@ -173,7 +173,7 @@ export class CustomerInvoicesPage extends React.Component {
         columns={[
           {
             key: 'otherPartyName',
-            width: 3,
+            width: 2.5,
             title: tableStrings.customer,
             sortable: true,
           },
@@ -185,7 +185,7 @@ export class CustomerInvoicesPage extends React.Component {
           },
           {
             key: 'status',
-            width: 1,
+            width: 2,
             title: tableStrings.status,
             sortable: true,
           },

diff --git a/src/pages/CustomerRequisitionPage.js b/src/pages/CustomerRequisitionPage.js
@@ -146,8 +146,8 @@ export class CustomerRequisitionPage extends React.Component {
     const infoColumns = [
       [
         {
-          title: `${pageInfoStrings.customer}:`,
-          info: requisition.otherStoreName ? requisition.otherStoreName.name : '',
+          title: `${pageInfoStrings.months_stock_required}:`,
+          info: requisition.monthsToSupply,
         },
         {
           title: `${pageInfoStrings.entry_date}:`,
@@ -156,8 +156,8 @@ export class CustomerRequisitionPage extends React.Component {
       ],
       [
         {
-          title: `${pageInfoStrings.months_stock_required}:`,
-          info: requisition.monthsToSupply,
+          title: `${pageInfoStrings.customer}:`,
+          info: requisition.otherStoreName ? requisition.otherStoreName.name : '',
         },
         {
           title: `${pageInfoStrings.comment}:`,

diff --git a/src/pages/SupplierRequisitionPage.js b/src/pages/SupplierRequisitionPage.js
@@ -190,10 +190,6 @@ export class SupplierRequisitionPage extends React.Component {
     const { requisition } = this.props;
     const infoColumns = [
       [
-        {
-          title: `${pageInfoStrings.supplier}:`,
-          info: requisition.otherStoreName ? requisition.otherStoreName.name : '',
-        },
         {
           title: `${pageInfoStrings.entry_date}:`,
           info: formatDate(requisition.entryDate),
@@ -204,6 +200,10 @@ export class SupplierRequisitionPage extends React.Component {
         },
       ],
       [
+        {
+          title: `${pageInfoStrings.supplier}:`,
+          info: requisition.otherStoreName ? requisition.otherStoreName.name : '',
+        },
         {
           title: `${pageInfoStrings.months_stock_required}:`,
           info: requisition.monthsToSupply,

diff --git a/src/widgets/TextEditor.js b/src/widgets/TextEditor.js
@@ -12,8 +12,10 @@ import {
 
 import { Button } from 'react-native-ui-components';
 import { TextInput } from './index';
+import { buttonStrings } from '../localization';
 import globalStyles from '../globalStyles';
 
+
 /**
  * Renders a View containing a TextInput and confirm Button, to allow editing
  * of the text passed in as a prop.
@@ -43,7 +45,7 @@ export class TextEditor extends React.Component {
         <Button
           style={[globalStyles.button, globalStyles.modalOrangeButton]}
           textStyle={[globalStyles.buttonText, globalStyles.modalButtonText]}
-          text="Done"
+          text={buttonStrings.done}
           onPress={() => this.props.onEndEditing(this.state.text)}
         />
       </View>