From cb5f042221773e11ce9eee57d998c709729b0552 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Fri, 27 Sep 2019 06:59:20 +0100 Subject: [PATCH] Fixing dev #62 --- Makefile | 9 +++ .../IT/Evolution/Feature.cs | 0 .../IT/Evolution/FeatureStatus.cs | 0 .../IT/Fixing/Bug.cs | 0 .../IT/Fixing/BugStatus.cs | 0 src/Yavsc.Abstract/Makefile | 6 +- ...ttributes.Validation.Resources.Designer.cs | 18 ++--- .../Yavsc.Models.IT.Fixing.Bug.Designer.cs | 2 +- .../Yavsc.Models.IT.Fixing.Bug.en.resx | 0 .../Resources/Yavsc.Models.IT.Fixing.Bug.resx | 0 .../Yavsc.Models.IT.Fixing.Resources.resx} | 13 ++-- ...vsc.Models.Messaging.Resources.Designer.cs | 18 ++--- src/Yavsc.Server/Makefile | 11 ++- src/Yavsc/Controllers/IT/ProjectController.cs | 3 +- src/Yavsc/Controllers/Survey/BugController.cs | 17 ++++- .../Controllers/Survey/FeatureController.cs | 8 +- src/Yavsc/Helpers/PageHelpers.cs | 6 +- src/Yavsc/Makefile | 11 ++- ...vsc.Models.IT.Fixing.Resources.Designer.cs | 76 +++++++++++++++++++ .../Yavsc.Models.IT.Fixing.Resources.resx | 68 +++++++++++++++++ .../Yavsc.YavscLocalisation.Designer.cs | 36 ++++++--- .../Resources/Yavsc.YavscLocalisation.resx | 7 ++ src/Yavsc/Views/Bug/Details.cshtml | 21 +++-- src/Yavsc/Views/Bug/Index.cshtml | 26 +++---- src/Yavsc/wwwroot/version | 2 +- 25 files changed, 276 insertions(+), 82 deletions(-) rename src/{Yavsc.Server/Models => Yavsc.Abstract}/IT/Evolution/Feature.cs (100%) rename src/{Yavsc.Server/Models => Yavsc.Abstract}/IT/Evolution/FeatureStatus.cs (100%) rename src/{Yavsc.Server/Models => Yavsc.Abstract}/IT/Fixing/Bug.cs (100%) rename src/{Yavsc.Server/Models => Yavsc.Abstract}/IT/Fixing/BugStatus.cs (100%) rename src/{Yavsc.Server => Yavsc.Abstract}/Resources/Yavsc.Models.IT.Fixing.Bug.Designer.cs (94%) rename src/{Yavsc.Server => Yavsc.Abstract}/Resources/Yavsc.Models.IT.Fixing.Bug.en.resx (100%) rename src/{Yavsc.Server => Yavsc.Abstract}/Resources/Yavsc.Models.IT.Fixing.Bug.resx (100%) rename src/{Yavsc/Resources/Yavsc.Models.IT.Fixing.Bug.resx => Yavsc.Abstract/Resources/Yavsc.Models.IT.Fixing.Resources.resx} (87%) create mode 100644 src/Yavsc/Resources/Yavsc.Models.IT.Fixing.Resources.Designer.cs create mode 100644 src/Yavsc/Resources/Yavsc.Models.IT.Fixing.Resources.resx diff --git a/Makefile b/Makefile index 68179839..6c28ba52 100644 --- a/Makefile +++ b/Makefile @@ -15,4 +15,13 @@ pushInPre: packages: make -C src/Yavsc.Abstract pack +findResources: + find src -name "*.resx" |sort + +prepare_all_code: + make -C src/Yavsc.Abstract prepare_code + make -C src/Yavsc.Server prepare_code + make -C src/Yavsc prepare_code + + .PHONY: packages diff --git a/src/Yavsc.Server/Models/IT/Evolution/Feature.cs b/src/Yavsc.Abstract/IT/Evolution/Feature.cs similarity index 100% rename from src/Yavsc.Server/Models/IT/Evolution/Feature.cs rename to src/Yavsc.Abstract/IT/Evolution/Feature.cs diff --git a/src/Yavsc.Server/Models/IT/Evolution/FeatureStatus.cs b/src/Yavsc.Abstract/IT/Evolution/FeatureStatus.cs similarity index 100% rename from src/Yavsc.Server/Models/IT/Evolution/FeatureStatus.cs rename to src/Yavsc.Abstract/IT/Evolution/FeatureStatus.cs diff --git a/src/Yavsc.Server/Models/IT/Fixing/Bug.cs b/src/Yavsc.Abstract/IT/Fixing/Bug.cs similarity index 100% rename from src/Yavsc.Server/Models/IT/Fixing/Bug.cs rename to src/Yavsc.Abstract/IT/Fixing/Bug.cs diff --git a/src/Yavsc.Server/Models/IT/Fixing/BugStatus.cs b/src/Yavsc.Abstract/IT/Fixing/BugStatus.cs similarity index 100% rename from src/Yavsc.Server/Models/IT/Fixing/BugStatus.cs rename to src/Yavsc.Abstract/IT/Fixing/BugStatus.cs diff --git a/src/Yavsc.Abstract/Makefile b/src/Yavsc.Abstract/Makefile index 81917d91..afd2bc7c 100644 --- a/src/Yavsc.Abstract/Makefile +++ b/src/Yavsc.Abstract/Makefile @@ -1,11 +1,13 @@ SOURCE_DIR=$(HOME)/workspace/yavsc MAKEFILE_DIR=$(SOURCE_DIR)/scripts/build/make -BASERESX=Resources/Yavsc.Attributes.Validation.Resources.resx Resources/Yavsc.Models.Messaging.Resources.resx +BASERESX=Resources/Yavsc.Attributes.Validation.Resources.resx \ + Resources/Yavsc.Models.Messaging.Resources.resx \ + Resources/Yavsc.Models.IT.Fixing.Bug.resx BASERESXGEN=$(BASERESX:.resx=.Designer.cs) include $(MAKEFILE_DIR)/versioning.mk include $(MAKEFILE_DIR)/dnx.mk -all: $(BINTARGETPATH) +all: $(BASERESXGEN) $(BINTARGETPATH) %.Designer.cs: %.resx strotygen -l -p -t -r "Yavsc.Abstract.Resources." $^ diff --git a/src/Yavsc.Abstract/Resources/Yavsc.Attributes.Validation.Resources.Designer.cs b/src/Yavsc.Abstract/Resources/Yavsc.Attributes.Validation.Resources.Designer.cs index b275ec3d..cb250655 100644 --- a/src/Yavsc.Abstract/Resources/Yavsc.Attributes.Validation.Resources.Designer.cs +++ b/src/Yavsc.Abstract/Resources/Yavsc.Attributes.Validation.Resources.Designer.cs @@ -1,12 +1,12 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Mono Runtime Version: 4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +// ------------------------------------------------------------------------------ namespace Yavsc.Attributes.Validation { using System; diff --git a/src/Yavsc.Server/Resources/Yavsc.Models.IT.Fixing.Bug.Designer.cs b/src/Yavsc.Abstract/Resources/Yavsc.Models.IT.Fixing.Bug.Designer.cs similarity index 94% rename from src/Yavsc.Server/Resources/Yavsc.Models.IT.Fixing.Bug.Designer.cs rename to src/Yavsc.Abstract/Resources/Yavsc.Models.IT.Fixing.Bug.Designer.cs index e733a2f3..6022902b 100644 --- a/src/Yavsc.Server/Resources/Yavsc.Models.IT.Fixing.Bug.Designer.cs +++ b/src/Yavsc.Abstract/Resources/Yavsc.Models.IT.Fixing.Bug.Designer.cs @@ -26,7 +26,7 @@ namespace Yavsc.Models.IT.Fixing { public static System.Resources.ResourceManager ResourceManager { get { if (object.Equals(null, resourceMan)) { - System.Resources.ResourceManager temp = new System.Resources.ResourceManager(("Yavsc.Server.Resources." + "Yavsc.Models.IT.Fixing.Bug"), typeof(Bug).GetTypeInfo().Assembly); + System.Resources.ResourceManager temp = new System.Resources.ResourceManager(("Yavsc.Abstract.Resources." + "Yavsc.Models.IT.Fixing.Bug"), typeof(Bug).GetTypeInfo().Assembly); resourceMan = temp; } return resourceMan; diff --git a/src/Yavsc.Server/Resources/Yavsc.Models.IT.Fixing.Bug.en.resx b/src/Yavsc.Abstract/Resources/Yavsc.Models.IT.Fixing.Bug.en.resx similarity index 100% rename from src/Yavsc.Server/Resources/Yavsc.Models.IT.Fixing.Bug.en.resx rename to src/Yavsc.Abstract/Resources/Yavsc.Models.IT.Fixing.Bug.en.resx diff --git a/src/Yavsc.Server/Resources/Yavsc.Models.IT.Fixing.Bug.resx b/src/Yavsc.Abstract/Resources/Yavsc.Models.IT.Fixing.Bug.resx similarity index 100% rename from src/Yavsc.Server/Resources/Yavsc.Models.IT.Fixing.Bug.resx rename to src/Yavsc.Abstract/Resources/Yavsc.Models.IT.Fixing.Bug.resx diff --git a/src/Yavsc/Resources/Yavsc.Models.IT.Fixing.Bug.resx b/src/Yavsc.Abstract/Resources/Yavsc.Models.IT.Fixing.Resources.resx similarity index 87% rename from src/Yavsc/Resources/Yavsc.Models.IT.Fixing.Bug.resx rename to src/Yavsc.Abstract/Resources/Yavsc.Models.IT.Fixing.Resources.resx index b386a5fb..397c0f2c 100644 --- a/src/Yavsc/Resources/Yavsc.Models.IT.Fixing.Bug.resx +++ b/src/Yavsc.Abstract/Resources/Yavsc.Models.IT.Fixing.Resources.resx @@ -58,8 +58,11 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Le titre est trop long - \ No newline at end of file + Rejeté + Inséré + Confirmé + Fonctionalité + Corrigé + + + diff --git a/src/Yavsc.Abstract/Resources/Yavsc.Models.Messaging.Resources.Designer.cs b/src/Yavsc.Abstract/Resources/Yavsc.Models.Messaging.Resources.Designer.cs index c4fbcc6e..afe973c5 100644 --- a/src/Yavsc.Abstract/Resources/Yavsc.Models.Messaging.Resources.Designer.cs +++ b/src/Yavsc.Abstract/Resources/Yavsc.Models.Messaging.Resources.Designer.cs @@ -1,12 +1,12 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Mono Runtime Version: 4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +// ------------------------------------------------------------------------------ namespace Yavsc.Models.Messaging { using System; diff --git a/src/Yavsc.Server/Makefile b/src/Yavsc.Server/Makefile index c909fbc1..0413f3a4 100644 --- a/src/Yavsc.Server/Makefile +++ b/src/Yavsc.Server/Makefile @@ -1,5 +1,10 @@ SOURCE_DIR=$(HOME)/workspace/yavsc MAKEFILE_DIR=$(SOURCE_DIR)/scripts/build/make +BASERESX=Resources/Yavsc.Models.Relationship.HyperLink.resx \ + Resources/Yavsc.Models.Streaming.LiveFlow.resx +BASERESXGEN=$(BASERESX:.resx=.Designer.cs) + + include $(MAKEFILE_DIR)/versioning.mk include $(MAKEFILE_DIR)/dnx.mk @@ -17,8 +22,6 @@ $(BINTARGETPATH): ../OAuth.AspNet.AuthServer/bin/$(CONFIGURATION)/OAuth.AspNet.A %.Designer.cs: %.resx strotygen -l -p -t -r "Yavsc.Server.Resources." $^ -prepare_code: Resources/Yavsc.Models.IT.Fixing.Bug.Designer.cs \ - Resources/Yavsc.Models.Relationship.HyperLink.Designer.cs \ - Resources/Yavsc.Models.Streaming.LiveFlow.Designer.cs +prepare_code: $(BASERESXGEN) -all: $(BINTARGETPATH) +all: $(BINTARGETPATH) diff --git a/src/Yavsc/Controllers/IT/ProjectController.cs b/src/Yavsc/Controllers/IT/ProjectController.cs index b99b0c46..7457c04f 100644 --- a/src/Yavsc/Controllers/IT/ProjectController.cs +++ b/src/Yavsc/Controllers/IT/ProjectController.cs @@ -20,6 +20,7 @@ namespace Yavsc.Controllers private ApplicationDbContext _context; ILogger _logger; IStringLocalizer _localizer; + IStringLocalizer _bugLocalizer; public ProjectController(ApplicationDbContext context, ILoggerFactory loggerFactory, @@ -69,7 +70,7 @@ namespace Yavsc.Controllers ViewBag.PaymentIdItems = _context.PayPalPayment.CreateSelectListItems (p => p.OrderReference, p => $"{p.Executor.UserName} {p.PaypalPayerId} {p.OrderReference}"); - ViewBag.Status = typeof(Yavsc.QueryStatus).CreateSelectListItems(null); + ViewBag.Status = _bugLocalizer.CreateSelectListItems(typeof(Yavsc.QueryStatus), Yavsc.QueryStatus.Inserted); ViewBag.RepositoryItems = _context.GitRepositoryReference.CreateSelectListItems( u => u.Id.ToString(), u => u.ToString()); diff --git a/src/Yavsc/Controllers/Survey/BugController.cs b/src/Yavsc/Controllers/Survey/BugController.cs index f81ec714..ecda8f73 100644 --- a/src/Yavsc/Controllers/Survey/BugController.cs +++ b/src/Yavsc/Controllers/Survey/BugController.cs @@ -8,6 +8,7 @@ using Yavsc.Server.Helpers; using System.Collections.Generic; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.Extensions.Localization; +using Microsoft.AspNet.Authorization; namespace Yavsc.Controllers { @@ -15,11 +16,16 @@ namespace Yavsc.Controllers { ApplicationDbContext _context; IStringLocalizer _localizer; + IStringLocalizer _statusLocalizer; - public BugController(ApplicationDbContext context, IStringLocalizer localizer ) + public BugController(ApplicationDbContext context, + IStringLocalizer localizer, + IStringLocalizer statusLocalizer + ) { _context = context; _localizer = localizer; + _statusLocalizer = statusLocalizer; } // GET: Bug @@ -54,9 +60,10 @@ namespace Yavsc.Controllers } IEnumerable Statuses(BugStatus ?status) => - typeof(Yavsc.Models.IT.Fixing.BugStatus).CreateSelectListItems(status); + _statusLocalizer.CreateSelectListItems(typeof(BugStatus), status); + IEnumerable Features(ApplicationDbContext context) => - context.Feature.CreateSelectListItems(f => f.Id.ToString(), f => f.ShortName, null) + context.Feature.CreateSelectListItems(f => f.Id.ToString(), f => $"{f.ShortName} ({f.Description})", null) .AddNull(_localizer["noAttachedFID"]); // POST: Bug/Create @@ -76,6 +83,7 @@ namespace Yavsc.Controllers } // GET: Bug/Edit/5 + [Authorize("AdministratorOnly")] public async Task Edit(long? id) { if (id == null) @@ -98,6 +106,7 @@ namespace Yavsc.Controllers // POST: Bug/Edit/5 [HttpPost] [ValidateAntiForgeryToken] + [Authorize("AdministratorOnly")] public async Task Edit(Bug bug) { if (ModelState.IsValid) @@ -111,6 +120,7 @@ namespace Yavsc.Controllers // GET: Bug/Delete/5 [ActionName("Delete")] + [Authorize("AdministratorOnly")] public async Task Delete(long? id) { if (id == null) @@ -130,6 +140,7 @@ namespace Yavsc.Controllers // POST: Bug/Delete/5 [HttpPost, ActionName("Delete")] [ValidateAntiForgeryToken] + [Authorize("AdministratorOnly")] public async Task DeleteConfirmed(long id) { Bug bug = await _context.Bug.SingleAsync(m => m.Id == id); diff --git a/src/Yavsc/Controllers/Survey/FeatureController.cs b/src/Yavsc/Controllers/Survey/FeatureController.cs index 0fad771b..48592253 100644 --- a/src/Yavsc/Controllers/Survey/FeatureController.cs +++ b/src/Yavsc/Controllers/Survey/FeatureController.cs @@ -7,6 +7,7 @@ using Microsoft.Data.Entity; namespace Yavsc.Controllers { + using Microsoft.Extensions.Localization; using Models; using Models.IT.Evolution; using Yavsc.Server.Helpers; @@ -14,11 +15,14 @@ namespace Yavsc.Controllers public class FeatureController : Controller { private ApplicationDbContext _context; + private IStringLocalizer _bugLocalizer; + IEnumerable Statuses(FeatureStatus ?status) => - typeof(FeatureStatus).CreateSelectListItems(status); - public FeatureController(ApplicationDbContext context) + _bugLocalizer.CreateSelectListItems(typeof(FeatureStatus), status); + public FeatureController(ApplicationDbContext context, IStringLocalizer bugLocalizer) { _context = context; + _bugLocalizer = bugLocalizer; } // GET: Feature diff --git a/src/Yavsc/Helpers/PageHelpers.cs b/src/Yavsc/Helpers/PageHelpers.cs index db3da727..70e5ee8d 100644 --- a/src/Yavsc/Helpers/PageHelpers.cs +++ b/src/Yavsc/Helpers/PageHelpers.cs @@ -1,12 +1,13 @@ using System; using System.Collections.Generic; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.Extensions.Localization; namespace Yavsc.Server.Helpers { public static class PageHelpers { - public static List CreateSelectListItems (this Type enumType, object selectedValue =null) + public static List CreateSelectListItems (this IStringLocalizer localisation, Type enumType, object selectedValue =null) { string selectedName = (selectedValue != null) ? enumType.GetEnumName(selectedValue) : null; @@ -17,12 +18,11 @@ namespace Yavsc.Server.Helpers { var itemName = names[index]; items.Add(new SelectListItem() { - Value = values.GetValue(index).ToString(), Text = itemName, Selected = ( itemName == selectedName) + Value = values.GetValue(index).ToString(), Text = localisation[itemName], Selected = ( itemName == selectedName) }) ; } var list = new SelectList(items); return items; - } public static List AddNull(this List selectList, string displayNull, object selectedValue = null) diff --git a/src/Yavsc/Makefile b/src/Yavsc/Makefile index 530868d4..050f255f 100644 --- a/src/Yavsc/Makefile +++ b/src/Yavsc/Makefile @@ -4,10 +4,11 @@ HOSTING=localhost ASPNET_LOG_LEVEL=debug SOURCE_DIR=$(HOME)/workspace/yavsc MAKEFILE_DIR=$(SOURCE_DIR)/scripts/build/make -BASERESX= Resources/Yavsc.ChatHub.resx\ - Resources/Yavsc.ViewComponents.CommentViewComponent.resx\ - Resources/Yavsc.ViewModels.FrontOffice.PerformerProfileViewModel.resx\ - Resources/Yavsc.ViewModels.EnrolerViewModel.resx\ +BASERESX= Resources/Yavsc.Models.IT.Fixing.Resources.resx \ + Resources/Yavsc.ChatHub.resx \ + Resources/Yavsc.ViewComponents.CommentViewComponent.resx \ + Resources/Yavsc.ViewModels.FrontOffice.PerformerProfileViewModel.resx \ + Resources/Yavsc.ViewModels.EnrolerViewModel.resx \ Resources/Yavsc.YavscLocalisation.resx BASERESXGEN=$(BASERESX:.resx=.Designer.cs) MCS_OPTIONS=--debug @@ -95,7 +96,5 @@ prepare_mvc_templates: $(SOURCE_DIR)/scripts/configure/tools/mvc-code-generators $(SOURCE_DIR)/scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/Details.cshtml cp $^ $(SOURCE_DIR)/packages/Microsoft.Extensions.CodeGenerators.Mvc/1.0.0-rc1-final/Templates/ViewGenerator/ -project.lock.json: project.json ../Yavsc.Abstract/project.lock.json ../Yavsc.Server/project.lock.json ../OAuth.AspNet.Token/project.lock.json ../OAuth.AspNet.AuthServer/project.lock.json - $(BINTARGETPATH): $(BASERESXGEN) project.lock.json diff --git a/src/Yavsc/Resources/Yavsc.Models.IT.Fixing.Resources.Designer.cs b/src/Yavsc/Resources/Yavsc.Models.IT.Fixing.Resources.Designer.cs new file mode 100644 index 00000000..a86f7b11 --- /dev/null +++ b/src/Yavsc/Resources/Yavsc.Models.IT.Fixing.Resources.Designer.cs @@ -0,0 +1,76 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Yavsc.Models.IT.Fixing { + using System; + using System.Reflection; + + + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + public partial class Resources { + + private static System.Resources.ResourceManager resourceMan; + + private static System.Globalization.CultureInfo resourceCulture; + + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + public static System.Resources.ResourceManager ResourceManager { + get { + if (object.Equals(null, resourceMan)) { + System.Resources.ResourceManager temp = new System.Resources.ResourceManager(("Yavsc.Resources." + "Yavsc.Models.IT.Fixing.Resources"), typeof(Resources).GetTypeInfo().Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + public static System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + public static string Rejected { + get { + return ResourceManager.GetString("Rejected", resourceCulture); + } + } + + public static string Inserted { + get { + return ResourceManager.GetString("Inserted", resourceCulture); + } + } + + public static string Confirmed { + get { + return ResourceManager.GetString("Confirmed", resourceCulture); + } + } + + public static string Feature { + get { + return ResourceManager.GetString("Feature", resourceCulture); + } + } + + public static string Fixed { + get { + return ResourceManager.GetString("Fixed", resourceCulture); + } + } + } +} diff --git a/src/Yavsc/Resources/Yavsc.Models.IT.Fixing.Resources.resx b/src/Yavsc/Resources/Yavsc.Models.IT.Fixing.Resources.resx new file mode 100644 index 00000000..397c0f2c --- /dev/null +++ b/src/Yavsc/Resources/Yavsc.Models.IT.Fixing.Resources.resx @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Rejeté + Inséré + Confirmé + Fonctionalité + Corrigé + + + diff --git a/src/Yavsc/Resources/Yavsc.YavscLocalisation.Designer.cs b/src/Yavsc/Resources/Yavsc.YavscLocalisation.Designer.cs index c9429ff4..92ea0fc4 100644 --- a/src/Yavsc/Resources/Yavsc.YavscLocalisation.Designer.cs +++ b/src/Yavsc/Resources/Yavsc.YavscLocalisation.Designer.cs @@ -1,12 +1,12 @@ -// ------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Mono Runtime Version: 4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -// ------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ namespace Yavsc { using System; @@ -1669,6 +1669,18 @@ namespace Yavsc { } } + public static string Feature { + get { + return ResourceManager.GetString("Feature", resourceCulture); + } + } + + public static string FeatureId { + get { + return ResourceManager.GetString("FeatureId", resourceCulture); + } + } + public static string to { get { return ResourceManager.GetString("to", resourceCulture); @@ -2106,5 +2118,11 @@ namespace Yavsc { return ResourceManager.GetString("Partenariat", resourceCulture); } } + + public static string IconWebUploadSpecification { + get { + return ResourceManager.GetString("IconWebUploadSpecification", resourceCulture); + } + } } } diff --git a/src/Yavsc/Resources/Yavsc.YavscLocalisation.resx b/src/Yavsc/Resources/Yavsc.YavscLocalisation.resx index a2f673e4..f6fd25b3 100644 --- a/src/Yavsc/Resources/Yavsc.YavscLocalisation.resx +++ b/src/Yavsc/Resources/Yavsc.YavscLocalisation.resx @@ -398,6 +398,8 @@ Selon son calendier Google, ce perstataire pourrait ne pas être disponible ce Ce prestataire n'a pas mis de calendrier à disposition. Titre + Fonctionalité + Identifiant de fonctionalité à Double identification Coût unitaire @@ -504,4 +506,9 @@ Facture réglée: {5} Flux live Instrumentation Partenariat + +Le format png pourrait être supporté ici, +le format Gif, peut-être aussi, et même, mais là, moins souvent, le surnommé Jpg. + + diff --git a/src/Yavsc/Views/Bug/Details.cshtml b/src/Yavsc/Views/Bug/Details.cshtml index a2815bda..d3c4a5d1 100644 --- a/src/Yavsc/Views/Bug/Details.cshtml +++ b/src/Yavsc/Views/Bug/Details.cshtml @@ -1,4 +1,5 @@ @model Yavsc.Models.IT.Fixing.Bug +@inject IStringLocalizer SRR @{ ViewData["Title"] = @SR["Details"]; @@ -7,34 +8,32 @@

@SR["Details"]

-

Bug

+

Bug

- @Html.DisplayNameFor(model => model.FeatureId) + @SR["FeatureId"]
@Html.DisplayFor(model => model.FeatureId)
- @Html.DisplayNameFor(model => model.Title) + @SR["Title"]
@Html.DisplayFor(model => model.Title)
- @Html.DisplayNameFor(model => model.Status) + @SR["Status"]
- @Html.DisplayFor(model => model.Status) -
-
- @Html.DisplayNameFor(model => model.Description) -
-
- @Html.DisplayFor(model => model.Description) + @SRR[typeof(Yavsc.Models.IT.Fixing.BugStatus).GetEnumNames()[(int)Model.Status]]
+ +

@SR["Description"]

+ 
@Html.DisplayFor(model => model.Description)
 +

@SR["Edit"] | diff --git a/src/Yavsc/Views/Bug/Index.cshtml b/src/Yavsc/Views/Bug/Index.cshtml index abf9172b..978f63c1 100644 --- a/src/Yavsc/Views/Bug/Index.cshtml +++ b/src/Yavsc/Views/Bug/Index.cshtml @@ -1,4 +1,5 @@ @model IEnumerable +@inject IStringLocalizer SRR @{ ViewData["Title"] = @SR["Index"]; @@ -9,22 +10,20 @@

@SR["Create New"]

+ - @@ -41,18 +40,13 @@ @Html.DisplayFor(modelItem => item.FeatureId) - } diff --git a/src/Yavsc/wwwroot/version b/src/Yavsc/wwwroot/version index 9daeafb9..9c5214e1 100644 --- a/src/Yavsc/wwwroot/version +++ b/src/Yavsc/wwwroot/version @@ -1 +1 @@ -test +de dévelopement.|
- @Html.DisplayNameFor(model => model.Id) + @SR[Html.DisplayNameFor(model => model.Id)] - @Html.DisplayNameFor(model => model.Title) + @SR[Html.DisplayNameFor(model => model.Title)] - @Html.DisplayNameFor(model => model.FeatureId) - - @Html.DisplayNameFor(model => model.Status) + @SR[Html.DisplayNameFor(model => model.FeatureId)] - @Html.DisplayNameFor(model => model.Description) + @SR[Html.DisplayNameFor(model => model.Status)]
- @Html.DisplayFor(modelItem => item.Status) - - 

-            @item.Description
-
+ @SRR[typeof(Yavsc.Models.IT.Fixing.BugStatus).GetEnumNames()[(int)item.Status]] 		- Edit | - Details | - Delete + @SR["Edit"] | + @SR["Details"] | + @SR["Delete"]