From fdc1af2b1a03310d62c839abdd05d92ca2e442ce Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Tue, 17 Jan 2012 02:33:50 +0000 Subject: [PATCH] Page fully localized - committing for the morrow --- Site5/App_GlobalResources/Global.resx | 28 ++++++++++++++++ Site5/App_GlobalResources/Pages.Ledgers.resx | 15 +++++++++ Site5/Pages/v5/Ledgers/SetRootBudgets.aspx | 2 +- Site5/Pages/v5/Ledgers/SetRootBudgets.aspx.cs | 33 ++++++++++++++++++- 4 files changed, 76 insertions(+), 2 deletions(-) diff --git a/Site5/App_GlobalResources/Global.resx b/Site5/App_GlobalResources/Global.resx index d058e9b8..159585d2 100644 --- a/Site5/App_GlobalResources/Global.resx +++ b/Site5/App_GlobalResources/Global.resx @@ -141,6 +141,27 @@ Dashboard Title of default page + + Actuals + + + Actuals (prel) + + + Actuals YTD + + + Bookkeeping Account + + + Account + + + Budget + + + Yearly result + Cancel Displayed as cancellation link on changing something @@ -165,6 +186,13 @@ Go there... Link after describing something. + + Nobody + Displayed when an account/position etc is vacant + + + Owner + Processing File... Displayed while processing an uploaded file (along with a progress bar). diff --git a/Site5/App_GlobalResources/Pages.Ledgers.resx b/Site5/App_GlobalResources/Pages.Ledgers.resx index 0cbcfcaa..b6506b91 100644 --- a/Site5/App_GlobalResources/Pages.Ledgers.resx +++ b/Site5/App_GlobalResources/Pages.Ledgers.resx @@ -117,10 +117,25 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Budget, Owner + Displayed above editables + + + This is where the root budgets are set for each budget year. After these are set, each budget owner suballocates funds within their respective budget trees. + + + Root Budgets For {0} + The {0} is replaced with the organization's name. + Set Root Level Budgets Displayed above main content + + Set New Budgets + Text on submit button + Bank Screenshot Displayed as header above modally zoomed screenshot diff --git a/Site5/Pages/v5/Ledgers/SetRootBudgets.aspx b/Site5/Pages/v5/Ledgers/SetRootBudgets.aspx index 5f2985e7..2b3660a5 100644 --- a/Site5/Pages/v5/Ledgers/SetRootBudgets.aspx +++ b/Site5/Pages/v5/Ledgers/SetRootBudgets.aspx @@ -16,7 +16,7 @@
- Budget, Owner [LOC]
+
  = _year) + { + this.LabelActualsHeader.Text = Resources.Global.Financial_Actuals; + } + else if (_year == DateTime.Today.Year) + { + this.LabelActualsHeader.Text = Resources.Global.Financial_ActualsToDate; + } + else + { + this.LabelActualsHeader.Text = Resources.Global.Financial_ActualsPreliminary; + } + } + protected void UpdateYearlyResult(FinancialAccounts rootAccounts) { Int64 budgetSum = 0; @@ -140,7 +169,7 @@ public partial class Pages_v5_Ledgers_SetRootBudgets : PageV5Base Person accountOwner = account.Owner; if (accountOwner == null) { - labelOwnerName.Text = "None [LOC]"; + labelOwnerName.Text = Resources.Global.Global_NoOwner; } else { @@ -194,6 +223,8 @@ public partial class Pages_v5_Ledgers_SetRootBudgets : PageV5Base this.RepeaterAccountActuals.DataSource = accounts; this.RepeaterAccountActuals.DataBind(); + LocalizeActualsHeader(); + this.RebindTooltips(); }