Browse Source

Merge branch 'dev' into cotur/file-scope-namespaces

pull/10696/head
maliming 5 years ago
parent
commit
395f8de866
No known key found for this signature in database GPG Key ID: 96224957E51C89E
  1. 2
      docs/en/Virtual-File-System.md
  2. 2
      framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/Localization/tr.json
  3. 3
      framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/TestResources/Source/tr.json
  4. 2
      framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/TestResources/SourceExt/tr.json

2
docs/en/Virtual-File-System.md

@ -119,7 +119,7 @@ The Virtual File System is well integrated to ASP.NET Core:
### Static Virtual File Folders ### Static Virtual File Folders
By default, ASP.NET Core only allows the `wwwroot` folder to contain the static files consumed by the clients. When you use the birtual File System, the following folders also can contain static files: By default, ASP.NET Core only allows the `wwwroot` folder to contain the static files consumed by the clients. When you use the virtual File System, the following folders also can contain static files:
* Pages * Pages
* Views * Views

2
framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/Localization/tr.json

@ -1,6 +1,6 @@
{ {
"culture": "tr", "culture": "tr",
"texts": { "texts": {
"Volo.Abp.Http.DynamicProxying:10001": "Verilerle ilgili iş istisnası: {0}"
} }
} }

3
framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/TestResources/Source/tr.json

@ -5,7 +5,6 @@
"Car": "Araba", "Car": "Araba",
"CarPlural": "Araba", "CarPlural": "Araba",
"MaxLenghtErrorMessage": "Bu alanın uzunluğu maksimum '{0}' karakter olabilir", "MaxLenghtErrorMessage": "Bu alanın uzunluğu maksimum '{0}' karakter olabilir",
"Universe": "Evren", "Universe": "Evren"
"FortyTwo": "Kırk iki"
} }
} }

2
framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/TestResources/SourceExt/tr.json

@ -1,6 +1,6 @@
{ {
"culture": "tr", "culture": "tr",
"texts": { "texts": {
"SeeYou": "Görüşürüz"
} }
} }
Loading…
Cancel
Save