Skip to content

Commit 7f29604

Browse files
rxturrxtur
committed
Some language resources added in dashboard and content pages
1 parent 9055814 commit 7f29604

17 files changed

Lines changed: 88 additions & 10 deletions

File tree

‎BlogEngine/BlogEngine.Core/BlogSettings.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1427,5 +1427,12 @@ public void Save()
14271427

14281428
#endregion
14291429

1430+
#region Legacy
1431+
1432+
public enum Moderation { Manual, Auto, Disqus }
1433+
public Moderation ModerationType { get { return Moderation.Auto; } }
1434+
1435+
#endregion
1436+
14301437
}
14311438
}

‎BlogEngine/BlogEngine.Core/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
[assembly: CLSCompliant(false)]
2020
[assembly: ComVisible(false)]
2121
[assembly: AllowPartiallyTrustedCallers]
22-
[assembly: AssemblyVersion("3.1.4.3")]
22+
[assembly: AssemblyVersion("3.1.4.4")]
2323
[assembly: SecurityRules(SecurityRuleSet.Level1)]

‎BlogEngine/BlogEngine.Core/Web/BlogCulture.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ void AddJavaScriptResources()
203203
AddResource("automoderation");
204204
AddResource("available");
205205
AddResource("avatars");
206+
AddResource("back");
206207
AddResource("backcolor");
207208
AddResource("basic");
208209
AddResource("beTheFirstToRate");
@@ -525,6 +526,7 @@ void AddJavaScriptResources()
525526
AddResource("lastUpdated");
526527
AddResource("latestComments");
527528
AddResource("latestFromTheGallery");
529+
AddResource("latestNews");
528530
AddResource("latitude");
529531
AddResource("link");
530532
AddResource("ListIsEmpty");
@@ -662,6 +664,7 @@ void AddJavaScriptResources()
662664
AddResource("purged");
663665
AddResource("purgeSelected");
664666
AddResource("quickAddNewCategory");
667+
AddResource("quickDraft");
665668
AddResource("raters");
666669
AddResource("rateThisXStars");
667670
AddResource("rating");
@@ -797,6 +800,7 @@ void AddJavaScriptResources()
797800
AddResource("theme");
798801
AddResource("themeCookieName");
799802
AddResource("themes");
803+
AddResource("theNew");
800804
AddResource("thePost");
801805
AddResource("thereAreXDrafts");
802806
AddResource("theValuesSaved");

‎BlogEngine/BlogEngine.NET/App_Data/labels.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ automatically
6565
automoderation
6666
available
6767
avatars
68+
back
6869
backcolor
6970
basic
7071
beTheFirstToRate
@@ -391,6 +392,7 @@ lastUpdate
391392
lastUpdated
392393
latestComments
393394
latestFromTheGallery
395+
latestNews
394396
latitude
395397
link
396398
ListIsEmpty
@@ -527,6 +529,7 @@ purgeAll
527529
purged
528530
purgeSelected
529531
quickAddNewCategory
532+
quickDraft
530533
raters
531534
rateThisXStars
532535
rating

‎BlogEngine/BlogEngine.NET/App_GlobalResources/labels.designer.cs‎

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎BlogEngine/BlogEngine.NET/App_GlobalResources/labels.resx‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2546,4 +2546,13 @@
25462546
<data name="theNew" xml:space="preserve">
25472547
<value>New</value>
25482548
</data>
2549+
<data name="back" xml:space="preserve">
2550+
<value>Back</value>
2551+
</data>
2552+
<data name="latestNews" xml:space="preserve">
2553+
<value>Latest News</value>
2554+
</data>
2555+
<data name="quickDraft" xml:space="preserve">
2556+
<value>Quick Draft</value>
2557+
</data>
25492558
</root>

‎BlogEngine/BlogEngine.NET/App_GlobalResources/labels.ru.resx‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1949,7 +1949,7 @@
19491949
<value>Размер шрифта</value>
19501950
</data>
19511951
<data name="forceMainTheme" xml:space="preserve">
1952-
<value></value>
1952+
<value />
19531953
</data>
19541954
<data name="forecolor" xml:space="preserve">
19551955
<value>Цвет шрифта</value>
@@ -2209,4 +2209,22 @@
22092209
<data name="customFields" xml:space="preserve">
22102210
<value>Дополнительные настройки</value>
22112211
</data>
2212+
<data name="back" xml:space="preserve">
2213+
<value>Назад</value>
2214+
</data>
2215+
<data name="latestNews" xml:space="preserve">
2216+
<value>Последние Новости</value>
2217+
</data>
2218+
<data name="quickDraft" xml:space="preserve">
2219+
<value>Черновая Запись</value>
2220+
</data>
2221+
<data name="sortOrder" xml:space="preserve">
2222+
<value>Порядок</value>
2223+
</data>
2224+
<data name="theNew" xml:space="preserve">
2225+
<value>Новая</value>
2226+
</data>
2227+
<data name="typeHere" xml:space="preserve">
2228+
<value>Текст...</value>
2229+
</data>
22122230
</root>

‎BlogEngine/BlogEngine.NET/Web.Config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,8 @@
218218
<clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="365.00:00:00" cacheControlCustom="public" />
219219
<remove fileExtension=".ico" />
220220
<mimeMap fileExtension=".ico" mimeType="image/x-icon" />
221+
<remove fileExtension=".woff" />
222+
<mimeMap fileExtension=".woff" mimeType="font/x-woff" />
221223
<remove fileExtension=".woff2" />
222224
<mimeMap fileExtension=".woff2" mimeType="font/x-woff" />
223225
<remove fileExtension=".svg" />

‎BlogEngine/BlogEngine.NET/admin/app/content/comments/commentFilters.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ <h4 class="modal-title">Add Filter</h4>
4646
</div>
4747
<div class="main-header clearfix">
4848
<h2 class="page-title pull-left">{{lbl.filters}}</h2>
49-
<button type="button" class="btn btn-default btn-sm btn-hasicon pull-left" onclick="window.history.back()"><i class="fa fa-angle-left"></i>Back</button>
49+
<button type="button" class="btn btn-default btn-sm btn-hasicon pull-left" onclick="window.history.back()"><i class="fa fa-angle-left"></i>{{lbl.back}}</button>
5050
<button data-toggle="modal" data-target="#AddFilter" class="btn btn-hasicon btn-sm btn-success pull-left"><i class="fa fa-plus"></i>{{lbl.add}}</button>
5151
<div class="btn-group pull-left">
5252
<a ng-click="processChecked('delete')" ng-disabled="itemsChecked() === false" class="btn btn-sm btn-danger" angular-tooltip tooltip="lbl.doDelete"><i class="fa fa-trash"></i></a>

‎BlogEngine/BlogEngine.NET/admin/app/content/comments/commentView.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ <h2 class="page-title pull-left">{{lbl.comments}}</h2>
3636
<input type="text" ng-model="query" ng-change="search()" placeholder="{{lbl.search}}..." />
3737
</div>
3838
<div class="dropdown pull-right">
39-
<button class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">ALL<i class="fa fa-angle-down"></i></button>
39+
<button class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">{{lbl.all}}<i class="fa fa-angle-down"></i></button>
4040
<ul class="dropdown-menu dropdown-menu-filter">
4141
<li><a id="fltr-all" data-value="{{lbl.all}}" ng-click="gridFilter('IsApproved','all','all')"> {{lbl.all}}</a></li>
4242
<li><a id="fltr-pnd" data-value="{{lbl.pending}}" ng-click="gridFilter('IsPending',true,'pnd')"> {{lbl.pending}}</a></li>

0 commit comments

Comments
 (0)