harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'origin'

Browse Source 
# Conflicts:
#   view/ja/hstrings.php
This commit is contained in:
harukin
2019-12-29 13:31:01 +09:00
parent 6f93d9848c fc9a901c4c
commit e1922bd555
41 changed files with 3616 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
view/de
-1
View File
@@ -1 +0,0 @@
de-de
view/de
+1
View File
@@ -0,0 +1 @@
de-de
view/es
-1
View File
@@ -1 +0,0 @@
es-es/
view/es
+1
View File
@@ -0,0 +1 @@
es-es/
view/ja-bk/hmessages.po
View File
view/ja-bk/hstrings.php
+3349
View File
File diff suppressed because it is too large Load Diff
view/ja/hstrings.php
+1 -1
View File
@@ -2,7 +2,7 @@
if(! function_exists("string_plural_select_ja")) {
function string_plural_select_ja($n){
return 0;;
return 0;
}}
App::$rtl = 0;
App::$strings["plural_function_code"] = "0";
view/tpl/comment_item.tpl
+1 -1
View File
@@ -18,7 +18,7 @@
{{$anon_extras}}
</div>
{{/if}}
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text" placeholder="{{$comment}}" name="body" ondragenter="linkdropper(event);" ondragleave="linkdropexit(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" ></textarea>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text" placeholder="{{$comment}}" name="body" ondragenter="linkdropper(event);" ondragleave="linkdropexit(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" onkeydown="if((event.ctrlKey&&event.keyCode==13) || (event.metaKey&&event.keyCode==13)){document.getElementById('comment-edit-submit-{{$id}}').click();return false};"></textarea>
<div id="comment-tools-{{$id}}" class="pt-2 comment-tools">
<div id="comment-edit-bb-{{$id}}" class="btn-toolbar pull-left">
<div class="btn-group mr-2">
view/tpl/jot.tpl
+1 -1
View File
@@ -52,7 +52,7 @@
</button>
{{/if}}
</div>
<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$placeholdtext}}" >{{$content}}</textarea>
<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$placeholdtext}}" onkeydown="if((event.ctrlKey&&event.keyCode==13) || (event.metaKey&&event.keyCode==13)){document.getElementById('dbtn-submit').click();return false};" >{{$content}}</textarea>
</div>
{{if $attachment}}
<div id="jot-attachment-wrap">