Explorar o código

Merge pull request #935 from bhikkhu-kosalla-china/laravel

Laravel
Bhikkhu China Kosalla %!s(int64=3) %!d(string=hai) anos
pai
achega
02272f0c84

+ 1 - 1
app/Http/Controllers/SentPrController.php

@@ -93,7 +93,7 @@ class SentPrController extends Controller
 			*/
 			$userinfo = new \UserInfo();
 
-			$username = $userinfo->getName($user_uid)['username'];
+			$username = $userinfo->getName($user_uid)['nikename'];
 			$palitext = PaliSentence::where('book',$data['book'])
 									->where('paragraph',$data['para'])
 									->where('word_begin',$data['begin'])

+ 3 - 1
public/app/users_guide/zh-cn/grammar_my_abs.md

@@ -3,4 +3,6 @@
 
 |格位|含义|翻译建议|关系|
 |-|-|-|-|
-|[**连续**体](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/abl.html)|表达先发生的动作|……完之后|[**前生动词** ➡ 后生动词<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-coc.html)|
+|[**连续**体](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/abl.html)|表达先发生的动作|……完之后|[**前生动词** ➡ 后生动词<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-coc.html)|
+|动名词(https://assets-hk.wikipali.org/pali-handbook/zh-Hans/verbal/pp.html)|表达先发生的动作|……完之后|[**前生动词** ➡ 后生动词<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-coc.html)|
+|过去分词(https://assets-hk.wikipali.org/pali-handbook/zh-Hans/verbal/pp.html)|表达先发生的动作|……完之后|[**前生动词** ➡ 后生动词<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-coc.html)|

+ 4 - 0
public/app/users_guide/zh-cn/grammar_my_acc1.md

@@ -5,5 +5,9 @@
 |格位|含义|翻译建议|关系|
 |-|-|-|-|
 |[**宾**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html)|表达**受动者**|把……|[受动者 ➡ 动词<br>IOV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-iov.html)|
+|[**宾**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html)|表达主动语态的**双宾语**|使**A**变成B|[受动者·主 ➡ 动词<br>DIO-P](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-dio.html#dio-p)|
+|[**宾**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html)|表达**主动**语态的**双宾语**|使A变成**B**|[受动者·次 ➡ 动词<br>DIO-S](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-dio.html#dio-s)|
+|[**主**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/nom.html)|表达**被动**语态**双宾语**|**A**被弄成B|[被动者·主 ➡ 被动动词<br>DAO-P](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/nom/nom-dao.html)|
+|[**主**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/nom.html)|表达**被动**语态**双宾语**|A被弄成**B**|[被动者·次 ➡ 被动动词<br>DAO-P](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/nom/nom-dao.html)|
 |[**主**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/nom.html)|表达**被动者**|被……|[被动者 ➡ 被动动词<br>AOV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/nom/nom-aov.html)|
 |[**属**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/nom.html)|表达**被动者**|……的|[受动者 ➡ 动词<br>AOV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/nom/nom-aov.html)|

+ 2 - 1
public/app/users_guide/zh-cn/grammar_my_acc2.md

@@ -4,4 +4,5 @@
 
 |格位|含义|翻译建议|关系|
 |-|-|-|-|
-|[**宾**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html)|表达**副词**|……地|[副词 ➡ 动词<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-adv.html)|
+|[**宾**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html)|用于修饰动词|……地|[副词 ➡ 动词<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-adv.html)|
+|副词|用于修饰动词|……地|[副词 ➡ 动词<br>ADV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-adv.html)|

+ 6 - 1
public/app/users_guide/zh-cn/grammar_my_time.md

@@ -1,3 +1,8 @@
 # 缅文语尾
 
-表示时间的整数
+表示持续一段时间
+
+|格位|含义|翻译建议|关系|
+|-|-|-|-|
+|[**宾**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html)|表达**持续**一段时间/空间|经过……|[时空连续性<br>STC](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-stc.html)|
+|副词|表达**持续**一段时间/空间|经过……|[时空连续性<br>STC](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/acc/acc-stc.html)|