diff --git a/Site/App_GlobalResources/Global.designer.cs b/Site/App_GlobalResources/Global.designer.cs index 95e5fd3c..93b6a63c 100644 --- a/Site/App_GlobalResources/Global.designer.cs +++ b/Site/App_GlobalResources/Global.designer.cs @@ -429,6 +429,15 @@ namespace Resources { } } + /// + /// Looks up a localized string similar to Due. + /// + internal static string Financial_DueDateShort { + get { + return ResourceManager.GetString("Financial_DueDateShort", resourceCulture); + } + } + /// /// Looks up a localized string similar to Earnings before Interest, Taxes, Depreciation, and Amortization. /// @@ -1123,7 +1132,7 @@ namespace Resources { } /// - /// Looks up a localized string similar to {0:MMMM} {0:d}. + /// Looks up a localized string similar to MMMM d. /// internal static string Global_DateFormatLongDateMonth { get { @@ -1141,7 +1150,7 @@ namespace Resources { } /// - /// Looks up a localized string similar to {0:MMM} {0:dd}. + /// Looks up a localized string similar to MMM dd. /// internal static string Global_DateFormatShortDateMonth { get { diff --git a/Site/App_GlobalResources/Global.resx b/Site/App_GlobalResources/Global.resx index a5abd251..3ab6e6c7 100644 --- a/Site/App_GlobalResources/Global.resx +++ b/Site/App_GlobalResources/Global.resx @@ -1092,12 +1092,16 @@ This line item can be automatically scanned by an app. This is when Swarmops can display an expense-to-be-paid in a format, that a mobile banking app can read directly, such as a QR code or other machine-readable format. + + Due + As "due date", as in when a payment is expected, but just the word "due" to be combined with an actual date in the UI. Example: *Due* Jan 21. + - {0:MMMM} {0:d} + MMMM d Format used for just date and month (no year). The formats are MMMM for month name, dd for zero-padded two-digit date, and d for date without padding. This is included as different languages use different ways to write month and date, for example, German would write "23. Dezember" (note the dot), a format which would be "{0:d}. {0:MMMM}". - {0:MMM} {0:dd} + MMM dd Format used for just date and month (no year). The formats are MMM for three-letter month name, dd for zero-padded two-digit date, and d for date without padding. This is included as different languages write month and date in different orders and with different separators. Do keep the month NAME though, rather than using the month number, even if that's common in the target language. \ No newline at end of file diff --git a/Site/App_GlobalResources/Pages.Financial.designer.cs b/Site/App_GlobalResources/Pages.Financial.designer.cs index 13427d2d..2633d28f 100644 --- a/Site/App_GlobalResources/Pages.Financial.designer.cs +++ b/Site/App_GlobalResources/Pages.Financial.designer.cs @@ -1257,15 +1257,6 @@ namespace Resources.Pages { } } - /// - /// Looks up a localized string similar to Account (OCR). - /// - internal static string PayoutMoney_GridHeader_Account_Ocr { - get { - return ResourceManager.GetString("PayoutMoney_GridHeader_Account_Ocr", resourceCulture); - } - } - /// /// Looks up a localized string similar to Amount. /// @@ -1275,33 +1266,6 @@ namespace Resources.Pages { } } - /// - /// Looks up a localized string similar to Amount (OCR). - /// - internal static string PayOutMoney_GridHeader_Amount_Ocr { - get { - return ResourceManager.GetString("PayOutMoney_GridHeader_Amount_Ocr", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Clearing / Account. - /// - internal static string PayOutMoney_GridHeader_BankAccount { - get { - return ResourceManager.GetString("PayOutMoney_GridHeader_BankAccount", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Bank. - /// - internal static string PayOutMoney_GridHeader_BankName { - get { - return ResourceManager.GetString("PayOutMoney_GridHeader_BankName", resourceCulture); - } - } - /// /// Looks up a localized string similar to Currency, Method. /// @@ -1311,15 +1275,6 @@ namespace Resources.Pages { } } - /// - /// Looks up a localized string similar to Due Date. - /// - internal static string PayOutMoney_GridHeader_DueDate { - get { - return ResourceManager.GetString("PayOutMoney_GridHeader_DueDate", resourceCulture); - } - } - /// /// Looks up a localized string similar to Paid. /// @@ -1356,15 +1311,6 @@ namespace Resources.Pages { } } - /// - /// Looks up a localized string similar to Reference (OCR). - /// - internal static string PayOutMoney_GridHeader_Reference_Ocr { - get { - return ResourceManager.GetString("PayOutMoney_GridHeader_Reference_Ocr", resourceCulture); - } - } - /// /// Looks up a localized string similar to Costs Ready For Payout. /// @@ -1374,15 +1320,6 @@ namespace Resources.Pages { } } - /// - /// Looks up a localized string similar to Costs for Payout (OCR for mobile apps). - /// - internal static string PayoutMoney_Header_Ocr { - get { - return ResourceManager.GetString("PayoutMoney_Header_Ocr", resourceCulture); - } - } - /// /// Looks up a localized string similar to These are the various forms of costs to the organization that have passed all the hurdles for payout. They are ready to be paid out to the recipient. Here is where you check them off as being paid out (probably while having your bank open in another window).. /// diff --git a/Site/App_GlobalResources/Pages.Financial.resx b/Site/App_GlobalResources/Pages.Financial.resx index 16175c42..003e6e10 100644 --- a/Site/App_GlobalResources/Pages.Financial.resx +++ b/Site/App_GlobalResources/Pages.Financial.resx @@ -417,26 +417,10 @@ Please describe what this purchase was. - - Account (OCR) - Amount Amount to be paid out - - Amount (OCR) - - - Clearing / Account - Will display as "XXXX / YYYYYYYY" where XXXX is the clearing number - - - Bank - - - Due Date - Paid Possibly in imperative; a click in this column indicates payment has been done. It is an action column, not an information column. @@ -449,15 +433,9 @@ Reference Depends on cost type - can be an OCR number for an invoice, a cash advance number, a salary spec, etc. - - Reference (OCR) - Costs Ready For Payout - - Costs for Payout (OCR for mobile apps) - These are the various forms of costs to the organization that have passed all the hurdles for payout. They are ready to be paid out to the recipient. Here is where you check them off as being paid out (probably while having your bank open in another window). diff --git a/Site/Pages/v5/Financial/PayOutMoney.aspx.cs b/Site/Pages/v5/Financial/PayOutMoney.aspx.cs index fb3e2ce6..a211d8f2 100644 --- a/Site/Pages/v5/Financial/PayOutMoney.aspx.cs +++ b/Site/Pages/v5/Financial/PayOutMoney.aspx.cs @@ -44,7 +44,7 @@ namespace Swarmops.Frontend.Pages.Financial InfoBoxLiteral = Resources.Pages.Financial.PayOutMoney_Info; this.LabelPayOutMoneyHeader.Text = Resources.Pages.Financial.PayOutMoney_Header; this.LabelGridHeaderAmount.Text = Resources.Pages.Financial.PayOutMoney_GridHeader_Amount; - this.LabelGridHeaderDue.Text = Resources.Pages.Financial.PayOutMoney_GridHeader_DueDate; + this.LabelGridHeaderDue.Text = Resources.Global.Financial_DueDate; this.LabelGridHeaderPay.Text = Resources.Pages.Financial.PayOutMoney_GridHeader_PayThis; this.LabelGridHeaderRecipient.Text = Resources.Pages.Financial.PayOutMoney_GridHeader_Recipient; this.LabelGridHeaderCurrencyMethod.Text = Resources.Pages.Financial.PayOutMoney_GridHeader_CurrencyMethod; @@ -56,7 +56,7 @@ namespace Swarmops.Frontend.Pages.Financial this.LabelModalHeader.Text = Resources.Pages.Financial.PayOutMoney_Modal_Header; this.LabelModalCurrencyAmount.Text = Resources.Pages.Financial.PayOutMoney_Modal_CurrencyAmount; this.LabelModalTransferMethod.Text = Resources.Pages.Financial.PayOutMoney_Modal_TransferMethod; - this.LabelModalHeaderDue.Text = Resources.Pages.Financial.PayOutMoney_GridHeader_DueDate; + this.LabelModalHeaderDue.Text = Resources.Global.Financial_DueDateShort; this.LabelSidebarOptions.Text = Resources.Global.Sidebar_Options; this.LabelOptionsShowOcr.Text = Resources.Pages.Financial.PayoutMoney_OptionShowOcr;