From f7e7b69eabe6b8a4fcb409a65d576cfce45b24ce Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 6 Nov 2017 10:30:25 +0100 Subject: [PATCH] CB: Translation eingebaut --- .gitignore | 2 + BeWo/BeWo.csproj | 10 +- BeWo/BeWo.csproj.user | 4 +- BeWo/BeWoApp.xaml | 6 +- BeWo/BeWoApp.xaml.cs | 6 +- BeWo/MainControl.xaml | 41 +- BeWo/MainControl.xaml.cs | 8 +- BeWo/MainWindow.xaml.cs | 24 +- .../Markup/TranslateExtension.cs | 24 + BeWo/MultiLanguage/ServiceTranslator.cs | 58 ++ BeWo/Scheduler/View/NewSchedulerView.xaml | 23 +- BeWo/Scheduler/View/NewSchedulerView.xaml.cs | 41 +- BeWo/ServiceProxy/Generated.cs | 9 + BeWo/View/ChatServiceCustomer.xaml | 25 +- BeWo/View/ChatServiceCustomer.xaml.cs | 50 +- .../MultiSupportConceptSelectionControl.xaml | 5 +- .../Accounting/EquityInvoiceItemEditView.xaml | 4 +- .../GeneralInvoiceItemEditView.xaml | 4 +- .../Detail/Accounting/InvoiceOverview.xaml | 4 +- .../ServiceInvoiceItemEditView.xaml | 4 +- .../Detail/Accounting/ServiceInvoiceView.xaml | 7 +- .../SettlementInvoiceItemEditView2.xaml | 4 +- .../AccountingTransactionBookingView.xaml.cs | 8 +- .../Detail/AccountingTransactionView.xaml | 8 +- .../View/Detail/AdditionalServiceView.xaml.cs | 12 +- BeWo/View/Detail/CustomerHistoryView.xaml | 13 +- BeWo/View/Detail/CustomerView.xaml | 39 +- BeWo/View/Detail/CustomerView.xaml.cs | 29 +- BeWo/View/Detail/CustomerView2.xaml | 11 +- BeWo/View/Detail/EmployeeView.xaml | 11 +- BeWo/View/Detail/GroupOfPeopleView.xaml | 11 +- BeWo/View/Detail/MandatorView.xaml | 25 +- BeWo/View/Detail/OrganisationView.xaml | 5 +- BeWo/View/Detail/PersonView.xaml | 11 +- .../Detail/Report/ServicesReportView.xaml | 3 +- .../Detail/Report/ServicesReportView.xaml.cs | 7 +- .../SupportConceptAnalysisListViewItem.xaml | 6 +- .../Report/SupportConceptsAnalysisView.xaml | 5 +- .../SupportConceptsAnalysisView.xaml.cs | 16 +- BeWo/View/Detail/ServiceRecordEditView.xaml | 5 +- .../View/Detail/ServiceRecordEditView.xaml.cs | 11 +- .../Detail/ServiceRecordGroupEditView.xaml.cs | 5 +- .../View/Detail/ServiceRecordHistoryView.xaml | 11 +- BeWo/View/Detail/ServiceRecordView2.xaml | 13 +- BeWo/View/Detail/ServiceRecordView2.xaml.cs | 50 +- BeWo/View/Detail/SupportConceptView.xaml | 87 +- BeWo/View/Detail/SupportConceptView.xaml.cs | 22 +- BeWo/View/HomeDragPanelView.xaml | 24 +- BeWo/View/Master/AdministrationView.xaml | 3 +- .../Navigation/CustomerNavigationView.xaml | 8 +- .../Navigation/CustomerNavigationView.xaml.cs | 13 +- .../Navigation/EmployeeNavigationView.xaml | 6 +- .../Navigation/EmployeeNavigationView.xaml.cs | 7 +- .../Navigation/MainNavigationView.xaml.cs | 5 +- .../Navigation/Sorter/SupportConceptSorter.cs | 3 +- .../SupportConceptNavigationView.xaml | 7 +- .../SupportConceptNavigationView.xaml.cs | 16 +- .../Report/AnnualReport/AnnualReportView.xaml | 6 +- .../Report/FLSReport/FLSOverviewGenerator.cs | 7 +- BeWo/View/Report/FLSReport/FLSReportView.xaml | 12 +- .../Report/FLSReport/FLSReportView.xaml.cs | 26 +- .../OutstandingReceivablesListViewItem.xaml | 2 +- .../Finance/OutstandingReceivablesView.xaml | 8 +- .../FLSOverviewGenerator.cs | 7 +- BeWo/View/Search/SupportConceptSearchView.cs | 4 +- ReportImp/ApiBerlin/ApiBerlin.csproj | 2 + .../CustomHomeContentGenerator.cs | 77 ++ ReportImp/DerKarrenSbd/DerKarrenSbd.csproj | 95 ++ .../DerKarrenSbd/Mitarbeiterstundenkonto.cs | 28 + .../Mitarbeiterstundenkonto.designer.cs | 717 ++++++++++++++ .../DerKarrenSbd/Mitarbeiterstundenkonto.resx | 123 +++ .../DerKarrenSbd/Properties/AssemblyInfo.cs | 36 + .../DerKarrenSbd/Properties/licenses.licx | 1 + ReportImp/DerKarrenSbd/Teamstundenkonto.cs | 28 + .../DerKarrenSbd/Teamstundenkonto.designer.cs | 897 ++++++++++++++++++ ReportImp/DerKarrenSbd/Teamstundenkonto.resx | 123 +++ Service/Plugins/DataExporter.cs | 11 +- Service/Plugins/SaveInterceptor.cs | 7 +- Service/Plugins/TranslationDictionary.cs | 39 + Service/Service.csproj | 1 + .../ServiceContracts/IOperationsService.cs | 4 + .../CustomerServiceImp.cs | 60 +- .../OperationsServiceImp.cs | 51 +- Shared/Core/EnumTranslations.cs | 385 ++++---- Shared/Shared.csproj | 2 + 85 files changed, 3022 insertions(+), 616 deletions(-) create mode 100644 BeWo/MultiLanguage/Markup/TranslateExtension.cs create mode 100644 BeWo/MultiLanguage/ServiceTranslator.cs create mode 100644 ReportImp/DerKarrenSbd/CustomHomeContentGenerator.cs create mode 100644 ReportImp/DerKarrenSbd/DerKarrenSbd.csproj create mode 100644 ReportImp/DerKarrenSbd/Mitarbeiterstundenkonto.cs create mode 100644 ReportImp/DerKarrenSbd/Mitarbeiterstundenkonto.designer.cs create mode 100644 ReportImp/DerKarrenSbd/Mitarbeiterstundenkonto.resx create mode 100644 ReportImp/DerKarrenSbd/Properties/AssemblyInfo.cs create mode 100644 ReportImp/DerKarrenSbd/Properties/licenses.licx create mode 100644 ReportImp/DerKarrenSbd/Teamstundenkonto.cs create mode 100644 ReportImp/DerKarrenSbd/Teamstundenkonto.designer.cs create mode 100644 ReportImp/DerKarrenSbd/Teamstundenkonto.resx create mode 100644 Service/Plugins/TranslationDictionary.cs diff --git a/.gitignore b/.gitignore index f0d36d9a4..ce4dc378c 100644 --- a/.gitignore +++ b/.gitignore @@ -257,3 +257,5 @@ /BeWoPlanerMobil/logs /Host/logs /.vs/BeWoGit/v15 +/ReportImp/DerKarrenSbd/obj/Debug +/ReportImp/DerKarrenSbd/obj/Release diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 8f6d75775..5cc301082 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -29,7 +29,7 @@ 3.5 - D:\Projects\beyondsoft\BeWoPlaner\Publish45\ + D:\Projects\beyondsoft\BeWoPlaner\PublishDev\ true Web true @@ -39,16 +39,16 @@ false true false - http://app.beyondsoft.de/sbd/ + http://app.beyondsoft.de/dev/ de-DE BeWoPlaner beyondSoft GmbH - 2.0.1.135 + 2.0.1.137 true publish.htm false true - 136 + 138 2.0.1.%2a false true @@ -565,6 +565,8 @@ ConfirmDemoDialog.xaml + + ProxyLoginView.xaml diff --git a/BeWo/BeWo.csproj.user b/BeWo/BeWo.csproj.user index f6318788f..939e64a26 100644 --- a/BeWo/BeWo.csproj.user +++ b/BeWo/BeWo.csproj.user @@ -1,8 +1,8 @@  - D:\Projects\beyondsoft\BeWoPlaner\Publish45\|D:\Projects\beyondsoft\BeWoPlaner\Publish\|C:\Projects\beyondsoft\BeWoPlaner\Publish\|D:\Projects\BEYONDSOFT\BeWoPlaner\Publish\|C:\Projects\BEYONDSOFT\BeWoPlaner\Publish\ - http://app.beyondsoft.de/sbd/|http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/deploy/|http://fortis-bewoplaner.fortis-ev.org.local/|http://FOBP01.fortis-ev.org.local/ + D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\|D:\Projects\beyondsoft\BeWoPlaner\Publish\|C:\Projects\beyondsoft\BeWoPlaner\Publish\|D:\Projects\BEYONDSOFT\BeWoPlaner\Publish\ + http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/sbd/|http://app.beyondsoft.de/deploy/|http://fortis-bewoplaner.fortis-ev.org.local/|http://FOBP01.fortis-ev.org.local/ diff --git a/BeWo/BeWoApp.xaml b/BeWo/BeWoApp.xaml index 3359276a9..1bb13025c 100644 --- a/BeWo/BeWoApp.xaml +++ b/BeWo/BeWoApp.xaml @@ -8,7 +8,9 @@ xmlns:microsoftWindowsThemes1="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Classic" StartupUri="MainWindow.xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" ShutdownMode="OnExplicitShutdown"> + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup" + mc:Ignorable="d" ShutdownMode="OnExplicitShutdown"> @@ -106,7 +108,7 @@ Reaktivieren - diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index d963e688e..9006428a3 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -207,7 +207,7 @@ namespace BeWo AppSettings.ShowAdvisedAttendedFlag = false; - String timeRecordingMenuName = "Zeiterfassung"; + String timeRecordingMenuName = ""; if (_Mandator != null) { @@ -493,9 +493,9 @@ namespace BeWo url += ".bewoplaner.de"; } } - if (url.IndexOf("/service") < 0) + if (url.IndexOf("/servicedev") < 0) { - url += "/service"; + url += "/servicedev"; } if (ServerAddress == "10.0.116.4") //LH Würzburg diff --git a/BeWo/MainControl.xaml b/BeWo/MainControl.xaml index a8142e274..cc9ceeed3 100644 --- a/BeWo/MainControl.xaml +++ b/BeWo/MainControl.xaml @@ -6,6 +6,7 @@ xmlns:localView="clr-namespace:BeWo.View" xmlns:r="clr-namespace:BeWo.Security" xmlns:BeWo="clr-namespace:BeWo" + xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup" Background="{DynamicResource ApplicationBackground}" SnapsToDevicePixels="True" RenderTransformOrigin="0.5,0.5" @@ -202,7 +203,7 @@ @@ -217,7 +218,7 @@ @@ -232,7 +233,7 @@ @@ -248,7 +249,7 @@ @@ -266,7 +267,7 @@ @@ -296,7 +297,7 @@ @@ -311,7 +312,7 @@ @@ -326,7 +327,7 @@ @@ -341,7 +342,7 @@ @@ -359,7 +360,7 @@ Click="button_CustomerTeam_Click" x:Name="button_CustomerTeam" Style="{StaticResource NavBarButton}" - Content="Kliententeams" + Content="{t:Translate Kliententeams}" Background="{StaticResource CustomerTeamContentBrush}" RenderTransformOrigin="0.5, 0.5" ImageSource="Ressources/Icons/UserGroupBusinessDisabled.png" Width="90"> @@ -375,7 +376,7 @@ - - + + --> +