Merge branch 'get-channel-progress-img' of https://github.com/visuddhinanda/mint into get-channel-progress-img

app/Console/Commands/UpgradeWbwAnalyses.php

@@ -0,0 +1,146 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use App\Models\Wbw;
+use App\Models\WbwAnalysis;
+
+
+class UpgradeWbwAnalyses extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'upgrade:wbwanalyses {id?}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '用户逐词解析数据填充wbw analyses表';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $bar = $this->output->createProgressBar(Wbw::count());
+        $counter =0;
+        if(empty($this->argument('id'))){
+            $it = Wbw::orderby('id')->cursor();
+        }else{
+            $it = Wbw::where('id',$this->argument('id'))->orderby('id')->cursor();
+        }
+        
+        foreach ($it as $wbwrow) {
+            $counter++;
+            WbwAnalysis::where('wbw_id',$wbwrow->id)->delete();
+            # code...
+            $data = str_replace("&nbsp;",' ',$wbwrow->data);
+            $data = str_replace("<br>",' ',$data);
+
+            $xmlString = "<root>" . $data . "</root>";
+            try{
+                $xmlWord = simplexml_load_string($xmlString);
+            }catch(Exception $e){
+                continue;
+            }
+            
+            $wordsList = $xmlWord->xpath('//word');
+            foreach ($wordsList as $word) {
+                $pali = $word->real->__toString();
+                foreach ($word as $key => $value) {
+                    $strValue = $value->__toString();
+                    if ($strValue !== "?" && $strValue !== "" && $strValue !== ".ctl." && $strValue !== ".a." && $strValue !== " " && mb_substr($strValue, 0, 3, "UTF-8") !== "[a]" && $strValue !== "_un_auto_factormean_" && $strValue !== "_un_auto_mean_") {
+                        $iType = 0;
+                        $lang = 'pali';
+                        $newData = [
+							'wbw_id'=>$wbwrow->id,
+							'wbw_word'=>$wbwrow->word,
+							'book_id'=>$wbwrow->book_id,
+							'paragraph'=>$wbwrow->paragraph,
+							'wid'=>$wbwrow->wid,
+                            'type'=>0,
+                            'data'=>$strValue,
+                            'confidence'=>100,
+                            'lang'=>'en',
+                            'editor_id'=>$wbwrow->editor_id,
+                            'created_at'=>$wbwrow->created_at,
+                            'updated_at'=>$wbwrow->updated_at
+						];
+                        #TODO 加虚词
+                        switch ($key) {
+                            case 'type':
+                                $newData['type']=1;
+                                WbwAnalysis::insert($newData);
+                                break;
+                            case 'gramma':
+                                $newData['type']=2;
+                                WbwAnalysis::insert($newData);
+                                break;
+                            case 'mean':
+                                $newData['type']=3;
+                                WbwAnalysis::insert($newData);
+                                break;
+                            case 'org':
+                                $newData['type']=4;
+                                WbwAnalysis::insert($newData);
+                                break;
+                            case 'om':
+                                $newData['type']=5;
+                                WbwAnalysis::insert($newData);
+                                break;
+                            case 'parent':
+                                $newData['type']=6;
+                                WbwAnalysis::insert($newData);
+                                break;
+                            case 'rela':
+                            /*
+                            <rela>[{"sour_id":"p199-764-6","sour_spell":"dhammacakkappavattanatthaṃ","dest_id":"p199-764-8","dest_spell":"āmantanā","relation":"ADV","note":""}]</rela>
+                            */
+                                $newData['type']=7;
+                                $rlt = json_decode($strValue);
+                                foreach ($rlt as $rltValue) {
+                                    # code...
+                                    if(!empty($rltValue->relation)){
+                                        $newData['data'] = $rltValue->relation;
+                                        if(isset($word->gramma) && !empty($word->gramma)){
+                                            $grm = explode('$',$word->gramma);
+                                            if(count($grm)>0){
+                                                $newData['d1'] = $grm[count($grm)-1];
+                                            }else{
+                                                $newData['d1'] = $word->type;
+                                            }
+                                        }
+                                        $newData['d2'] = (int)(explode('-',$rltValue->dest_id)[2]) - (int)(explode('-',$rltValue->sour_id)[2]) ;
+                                        WbwAnalysis::insert($newData);
+                                    }
+                                }
+                                break;
+                        }
+                    }
+                }
+            }
+            $bar->advance();
+        }
+        $bar->finish();
+        $this->info("wbw analyses finished");
+        return 0;
+    }
+}

app/Http/Controllers/AnalysisController.php

@@ -0,0 +1,92 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\WbwAnalysis;
+use Illuminate\Http\Request;
+
+class AnalysisController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+        $result = WbwAnalysis::selectRaw('d1, data ,count(*) as ct')
+                             ->where('type',7)
+                             ->groupby('d1')
+                             ->groupby('data')
+                             ->orderbyRaw('d1,ct desc')
+                             ->get();
+        return view('wbwanalyses',['data'=>$result]);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\Models\WbwAnalysis  $wbwAnalysis
+     * @return \Illuminate\Http\Response
+     */
+    public function show(WbwAnalysis $wbwAnalysis)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\Models\WbwAnalysis  $wbwAnalysis
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(WbwAnalysis $wbwAnalysis)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Models\WbwAnalysis  $wbwAnalysis
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, WbwAnalysis $wbwAnalysis)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\Models\WbwAnalysis  $wbwAnalysis
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(WbwAnalysis $wbwAnalysis)
+    {
+        //
+    }
+}

app/Http/Controllers/WbwAnalysisController.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\WbwAnalysis;
+use Illuminate\Http\Request;
+
+class WbwAnalysisController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *select d1, data ,count(*) as ct from wbw_analyses where type = 7  group by d1,data order by d1,ct desc 
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+        $result = WbwAnalysis::selectRaw('d1, data ,count(*) as ct')
+                             ->where('type',7)
+                             ->groupby('d1')
+                             ->groupby('data')
+                             ->orderbyRaw('d1,ct desc')
+                             ->get();
+        return view('wbwanalyses',['data'=>$result]);
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\Models\WbwAnalysis  $wbwAnalysis
+     * @return \Illuminate\Http\Response
+     */
+    public function show(WbwAnalysis $wbwAnalysis)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Models\WbwAnalysis  $wbwAnalysis
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, WbwAnalysis $wbwAnalysis)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\Models\WbwAnalysis  $wbwAnalysis
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(WbwAnalysis $wbwAnalysis)
+    {
+        //
+    }
+}

app/Models/WbwAnalysis.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class WbwAnalysis extends Model
+{
+    use HasFactory;
+}

database/migrations/2022_02_07_012707_create_wbw_analyses_table.php

@@ -0,0 +1,59 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateWbwAnalysesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     
+     * @return void
+     */
+     /*
+     'userid',
+                            'pali',
+                            'book',
+                            'paragraph',
+                            'wid',
+                            'type',
+                            'data',
+                            'confidence',
+                            'lang',
+                            'modify_time')
+     */
+    public function up()
+    {
+        Schema::create('wbw_analyses', function (Blueprint $table) {
+            $table->id();
+            $table->bigInteger('wbw_id')->index();
+            $table->string('wbw_word',1024);
+            $table->integer('book_id');
+            $table->integer('paragraph');
+            $table->integer('wid');
+            $table->integer('type');
+            $table->text('data')->index();
+            $table->integer('confidence');
+            $table->string('lang',16);
+            $table->text('d1')->nullable()->index();//备用数据
+            $table->text('d2')->nullable()->index();//备用数据
+            $table->text('d3')->nullable()->index();//备用数据
+            $table->bigInteger('editor_id');
+            $table->timestamps();
+
+            $table->index(['type','data']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('wbw_analyses');
+    }
+}

public/app/channal/channal.js

@@ -220,7 +220,7 @@ function my_channal_edit(id) {
 					html += "</div>";
 
 					html += '<div style="display:flex;line-height:32px;">';
-					html += '<div style="flex:2;">' + gLocal.gui.privacy + "</div>";
+					html += '<div style="flex:2;">' + gLocal.gui.channel_type + "</div>";
 					html += '<div style="flex:8;">';
                     html += "<select id = 'type'  name = 'type'>";
 					for (const iterator of enumChannelType) {

public/app/pcdl/head_bar.php

@@ -499,7 +499,7 @@ switch($_COOKIE['language']){
 							</a>
 						</li>
 						<li>
-							<a href="../calendar/" target="_blank">
+							<a href="../calendar/index.html" target="_blank">
 								<div class="nav_link"><?php echo $_local->gui->buddhist_calendar; ?></div>
 							</a>
 						</li>

public/app/public/charcode/converter_tai_tham.js

@@ -1,5 +1,7 @@
 var char_roman_to_tai = [
 	//{ id: "n’</w>ti<w>", value: "nti" },
+	{ id: "ndr", value: "nrd" },
+	{ id: "ntr", value: "nrt" },
 	{ id: "bbho", value: "ᨻᩮ᩠ᨽᩣ" },
 	{ id: "ccho", value: "ᨧᩮ᩠ᨨᩣ" },
 	{ id: "ddho", value: "ᨴᩮ᩠ᨵᩣ" },
@@ -55,7 +57,7 @@ var char_roman_to_tai = [
 	{ id: "kko", value: "ᨠᩮ᩠ᨠᩣ" },
 	{ id: "kro", value: "ᨠᩮ᩠ᩕᩣ" },
 	{ id: "mbo", value: "ᨾᩮ᩠ᨻᩣ" },
-	{ id: "mmo", value: "ᨾᩮ᩠ᨾᩣ" },
+	{ id: "mmo", value: "ᨾᩮᩜᩣ" },
 	{ id: "mpo", value: "ᨾᩮ᩠ᨷᩣ" },
 	{ id: "ndo", value: "ᨶᩮᩣ᩠ᨴ" },
 	{ id: "nno", value: "ᨶᩮᩣ᩠ᨶ" },
@@ -102,7 +104,7 @@ var char_roman_to_tai = [
 	{ id: "ñje", value: "ᨬᩮ᩠ᨩ" },
 	{ id: "kke", value: "ᨠᩮ᩠ᨠ" },
 	{ id: "ṅke", value: "ᩘᨠᩮ" },//  ᩘᩮ᩠ᨠ
-	{ id: "mme", value: "ᨾᩮ᩠ᨾ" },
+	{ id: "mme", value: "ᨾᩮᩜ" },
 	{ id: "nne", value: "ᨶᩮ᩠ᨶ" },
 	{ id: "ññe", value: "ᨬᩮ᩠ᨬ" },
 	{ id: "ṇṇe", value: "ᨱᩮ᩠ᨱ" },
@@ -127,82 +129,85 @@ var char_roman_to_tai = [
 	{ id: "yye", value: "ᨿᩮ᩠ᨿ" },
 	//{ id: "mmā", value: "ᨾᩜᩣ" },
 	//{ id: "mma", value: "ᨾᩜ" },
+	{ id: "by", value: "ᨻ᩠ᨿ᩠" },
 	{ id: "ṭṭh", value: "ᨭᩛ᩠" },
-		
-	{ id: "ss", value: "ᩔ᩠" },
-	{ id: "vh", value: "ᩅ᩠ᩉ᩠" },
-	{ id: "vy", value: "ᩅ᩠ᨿ᩠" },
-	{ id: "vr", value: "ᩅᩕ᩠" },
-	{ id: "yh", value: "ᨿ᩠ᩉ᩠" },
-	{ id: "yy", value: "ᨿ᩠ᨿ᩠" },
-	{ id: "yr", value: "ᨿᩕ᩠" },
-	{ id: "yv", value: "ᨿ᩠ᩅ᩠" },
-	{ id: "hy", value: "ᩉ᩠ᨿ᩠" },
-	{ id: "hr", value: "ᩉᩕ᩠" },
-	{ id: "hv", value: "ᩉ᩠ᩅ᩠" },
-	{ id: "rv", value: "ᩁ᩠ᩅ᩠" },
-	{ id: "rh", value: "ᩁ᩠ᩉ᩠" },
-	{ id: "ry", value: "ᩁ᩠ᨿ᩠" },
-	{ id: "kh", value: "ᨡ᩠" },
-	{ id: "gh", value: "ᨥ᩠" },
-	{ id: "ch", value: "ᨨ᩠" },
-	{ id: "jh", value: "ᨫ᩠" },
-	{ id: "ññ", value: "ᨬ᩠ᨬ᩠" },
-	{ id: "ṭh", value: "ᨮ᩠" },
-	{ id: "ḍh", value: "ᨰ᩠" },
-	{ id: "th", value: "ᨳ᩠" },
-	{ id: "dh", value: "ᨵ᩠" },
-	{ id: "ph", value: "ᨹ᩠" },
-	{ id: "bh", value: "ᨽ᩠" },
-	{ id: "k", value: "ᨠ᩠" },
-	{ id: "g", value: "ᨣ᩠" },
-	{ id: "c", value: "ᨧ᩠" },
-	{ id: "j", value: "ᨩ᩠" },
-	{ id: "ñ", value: "ᨬ᩠" },
-	{ id: "ḷ", value: "ᩊ᩠" },
-	{ id: "ṭ", value: "ᨭ᩠" },
-	{ id: "ḍ", value: "ᨯ᩠" },
-	{ id: "ṇ", value: "ᨱ᩠" },
-	{ id: "t", value: "ᨲ᩠" },
-	{ id: "d", value: "ᨴ᩠" },
-	{ id: "n", value: "ᨶ᩠" },
-	{ id: "p", value: "ᨷ᩠" },
-	{ id: "b", value: "ᨻ᩠" },
-	{ id: "m", value: "ᨾ᩠" },
-	{ id: "l", value: "ᩃ᩠" },
-	{ id: "s", value: "ᩈ᩠" },
-	{ id: "ṅ", value: "ᩘ" },
-	{ id: "᩠h", value: "᩠ᩉ᩠" },
-	{ id: "h", value: "ᩉ᩠" },
-	{ id: "᩠y", value: "᩠ᨿ" },
-	{ id: "y", value: "ᨿ᩠" },
-	{ id: "᩠r", value: "ᩕ᩠" },
-	{ id: "r", value: "ᩁ᩠" },
-	{ id: "᩠v", value: "᩠ᩅ᩠" },
-	{ id: "v", value: "ᩅ᩠" },
-	{ id: "᩠aṃ", value: "ᩴ" },
-	{ id: "᩠iṃ", value: "ᩥᩴ" },
-	{ id: "᩠uṃ", value: "ᩩᩴ" },
-	{ id: "᩠ā", value: "ᩣ" },
-	{ id: "᩠i", value: "ᩥ" },
-	{ id: "᩠ī", value: "ᩦ" },
-	{ id: "᩠u", value: "ᩩ" },
-	{ id: "᩠ū", value: "ᩪ" },
-	{ id: "᩠e", value: "ᩮ" },
-	{ id: "᩠o", value: "ᩮᩣ" },
-	{ id: "aṃ", value: "ᩋᩴ" },
-	{ id: "iṃ", value: "ᨠ᩠ᨠᩴ" },
-	{ id: "uṃ", value: "ᩏᩴ" },
-	{ id: "a", value: "ᩋ" },
-	{ id: "ā", value: "ᩋᩣ" },
-	{ id: "i", value: "ᩍ" },
-	{ id: "ī", value: "ᩎ" },
-	{ id: "u", value: "ᩏ" },
-	{ id: "ū", value: "ᩐ" },
-	{ id: "e", value: "ᩑ" },
-	{ id: "o", value: "ᩒ" },
-	{ id: "᩠᩼ᩋ", value: "" },
-	{ id: "᩠ᩋ", value: "" },
+
+{ id: "ss", value: "ᩔ᩠" },
+{ id: "vh", value: "ᩅ᩠ᩉ᩠" },
+{ id: "vy", value: "ᩅ᩠ᨿ᩠" },
+{ id: "vr", value: "ᩅᩕ᩠" },
+{ id: "yh", value: "ᨿ᩠ᩉ᩠" },
+{ id: "yy", value: "ᨿ᩠ᨿ᩠" },
+{ id: "yr", value: "ᨿᩕ᩠" },
+{ id: "yv", value: "ᨿ᩠ᩅ᩠" },
+{ id: "hy", value: "ᩉ᩠ᨿ᩠" },
+{ id: "hr", value: "ᩉᩕ᩠" },
+{ id: "hv", value: "ᩉ᩠ᩅ᩠" },
+{ id: "rv", value: "ᩁ᩠ᩅ᩠" },
+{ id: "rh", value: "ᩁ᩠ᩉ᩠" },
+{ id: "ry", value: "ᩁ᩠ᨿ᩠" },
+{ id: "kh", value: "ᨡ᩠" },
+{ id: "gh", value: "ᨥ᩠" },
+{ id: "ch", value: "ᨨ᩠" },
+{ id: "jh", value: "ᨫ᩠" },
+{ id: "ññ", value: "ᨬ᩠ᨬ᩠" },
+{ id: "ṭh", value: "ᨮ᩠" },
+{ id: "ḍh", value: "ᨰ᩠" },
+{ id: "th", value: "ᨳ᩠" },
+{ id: "dh", value: "ᨵ᩠" },
+{ id: "ph", value: "ᨹ᩠" },
+{ id: "bh", value: "ᨽ᩠" },
+{ id: "k", value: "ᨠ᩠" },
+{ id: "g", value: "ᨣ᩠" },
+{ id: "c", value: "ᨧ᩠" },
+{ id: "j", value: "ᨩ᩠" },
+{ id: "ñ", value: "ᨬ᩠" },
+{ id: "ḷ", value: "ᩊ᩠" },
+{ id: "ṭ", value: "ᨭ᩠" },
+{ id: "ḍ", value: "ᨯ᩠" },
+{ id: "ṇ", value: "ᨱ᩠" },
+{ id: "t", value: "ᨲ᩠" },
+{ id: "d", value: "ᨴ᩠" },
+{ id: "n", value: "ᨶ᩠" },
+{ id: "p", value: "ᨷ᩠" },
+{ id: "b", value: "ᨻ᩠" },
+{ id: "m", value: "ᨾ᩠" },
+{ id: "l", value: "ᩃ᩠" },
+{ id: "s", value: "ᩈ᩠" },
+{ id: "ṅ", value: "ᩘ" },
+{ id: "᩠h", value: "᩠ᩉ᩠" },
+{ id: "h", value: "ᩉ᩠" },
+{ id: "᩠y", value: "᩠ᨿ" },
+{ id: "y", value: "ᨿ᩠" },
+{ id: "᩠r", value: "ᩕ᩠" },
+{ id: "r", value: "ᩁ᩠" },
+{ id: "᩠v", value: "᩠ᩅ᩠" },
+{ id: "v", value: "ᩅ᩠" },
+{ id: "᩠ᨾ", value: "ᩜ" },
+{ id: "᩠ai", value: "ᩱ" },
+{ id: "᩠aṃ", value: "ᩴ" },
+{ id: "᩠iṃ", value: "ᩥᩴ" },
+{ id: "᩠uṃ", value: "ᩩᩴ" },
+{ id: "᩠ā", value: "ᩣ" },
+{ id: "᩠i", value: "ᩥ" },
+{ id: "᩠ī", value: "ᩦ" },
+{ id: "᩠u", value: "ᩩ" },
+{ id: "᩠ū", value: "ᩪ" },
+{ id: "᩠e", value: "ᩮ" },
+{ id: "᩠o", value: "ᩮᩣ" },
+{ id: "aṃ", value: "ᩋᩴ" },
+{ id: "iṃ", value: "ᨠ᩠ᨠᩴ" },
+{ id: "uṃ", value: "ᩏᩴ" },
+{ id: "a", value: "ᩋ" },
+{ id: "ā", value: "ᩋᩣ" },
+{ id: "i", value: "ᩍ" },
+{ id: "ī", value: "ᩎ" },
+{ id: "u", value: "ᩏ" },
+{ id: "ū", value: "ᩐ" },
+{ id: "e", value: "ᩑ" },
+{ id: "o", value: "ᩒ" },
+{ id: "᩠᩼ᩋ", value: "" },
+{ id: "᩠ᩋ", value: "" },
 //{ id: "ᨡᩮᩣ", value: "ᨡᩮᩤ" },
 //{ id: "ᨡᩣ", value: "ᨡᩤ" },
 { id: "ᨠ᩠ᨡᩮᩤ", value: "ᨠᩮ᩠ᨡᩣ" },
@@ -222,6 +227,7 @@ var char_roman_to_tai = [
 { id: "ᩘ ", value: "ᩘ" },
 { id: "ᨷ᩠ᨷᩤ", value: "ᨷ᩠ᨷᩣ" },
 { id: "ᨲ᩠ᩅᩤ", value: "ᨲ᩠ᩅᩣ" },
+{ id: "ᩈ᩠ᩅᩤ", value: "ᩈ᩠ᩅᩣ" },
 { id: "ᩮ᩠ᨷᩤ", value: "ᩮ᩠ᨷᩣ" },
 		
 ];
@@ -285,6 +291,7 @@ var char_tai_to_roman = [
 	{ id: "ᨠᩮ᩠ᨠᩣ", value: "kko" },
 	{ id: "ᨠᩮ᩠ᩕᩣ", value: "kro" },
 	{ id: "ᨾᩮ᩠ᨻᩣ", value: "mbo" },
+	{ id: "ᨾᩮᩜᩣ", value: "mmo" },
 	{ id: "ᨾᩮ᩠ᨾᩣ", value: "mmo" },
 	{ id: "ᨾᩮ᩠ᨷᩣ", value: "mpo" },
 	{ id: "ᨶᩮᩣ᩠ᨴ", value: "ndo" },
@@ -332,6 +339,7 @@ var char_tai_to_roman = [
 	{ id: "ᨬᩮ᩠ᨩ", value: "ñje" },
 	{ id: "ᨠᩮ᩠ᨠ", value: "kke" },
 	{ id: "ᩘᨠᩮ", value: "ṅke" },
+	{ id: "ᨾᩮᩜ", value: "mmo" },
 	{ id: "ᨾᩮ᩠ᨾ", value: "mme" },
 	{ id: "ᨶᩮ᩠ᨶ", value: "nne" },
 	{ id: "ᨬᩮ᩠ᨬ", value: "ññe" },
@@ -357,6 +365,8 @@ var char_tai_to_roman = [
 	{ id: "ᨿᩮ᩠ᨿ", value: "yye" },
 	{ id: "ᨾᩜᩣ", value: "mmā" },
 
+	{ id: "ᩜ", value: "᩠ma" },
+	{ id: "ᩱ", value: "᩠ai" },
 	{ id: "ᩴ", value: "᩠aṃ" },
 	{ id: "ᩥᩴ", value: "᩠iṃ" },
 	{ id: "ᩩᩴ", value: "᩠uṃ" },
@@ -493,6 +503,8 @@ var char_tai_to_roman = [
 	{ id: "e᩠ā", value: "o" },
 	{ id: "a᩠", value: "" },
 	{ id: "᩠a", value: "" },
+	{ id: "nrd", value: "ndr" },
+	{ id: "nrt", value: "ntr" },
 
 ];
 

public/app/public/charcode/coverter_my.js

@@ -96,28 +96,16 @@ var char_roman_to_myn = [
 	{ id: "ငော", value: "ငေါ" },
 	{ id: "ဒော", value: "ဒေါ" },
 	{ id: "ပော", value: "ပေါ" },
-	{ id: "ဝော", value: "ဝေါ" },
-	{ id: "ဂာ", value: "ဂါ" }, //g
-	{ id: "ငာ", value: "ငါ" }, //ṅ
-	{ id: "ဒာ", value: "ဒါ" }, //d
-	{ id: "ပာ", value: "ပါ" }, //p
-	{ id: "ဝာ", value: "ဝါ" }, //v
+	{ id: "ဝော", value: "ဝေါ" },//vo
+	{ id: "ဂာ", value: "ဂါ" }, //gā
+	{ id: "ငာ", value: "ငါ" }, //ṅā
+	{ id: "ဒာ", value: "ဒါ" }, //dā
+	{ id: "ပာ", value: "ပါ" }, //pā
+	{ id: "ဝာ", value: "ဝါ" }, //vā
 	{ id: "ဒွာ", value: "ဒွါ" }, //dvā
-	{ id: "1", value: "၁" },
-	{ id: "2", value: "၂" },
-	{ id: "3", value: "၃" },
-	{ id: "4", value: "၄" },
-	{ id: "5", value: "၅" },
-	{ id: "6", value: "၆" },
-	{ id: "7", value: "၇" },
-	{ id: "8", value: "၈" },
-	{ id: "9", value: "၉" },
-	{ id: "0", value: "၀" },
-	{ id: "．", value: "။" },
-	{ id: ";", value: "။" },
-	{ id: "，", value: "၊" },
-	{ id: ",", value: "၊" },
+	
 ];
+
 var char_myn_to_roman_1 = [
 	{ id: "ႁႏၵ", value: "ndra" }, //後加
 
@@ -192,6 +180,7 @@ var char_myn_to_roman_1 = [
 	{ id: "aျ္", value: "ya" },
 	{ id: "aွ္", value: "va" },
 	{ id: "aြ္", value: "ra" },
+	{ id: "aြ", value: "ra" },
 
 	{ id: "ၱ", value: "္ta" }, //后加
 	{ id: "ၳ", value: "္tha" }, //后加
@@ -220,7 +209,8 @@ var char_myn_to_roman_1 = [
 	{ id: "ျ", value: "္ya" }, //后加
 	{ id: "ႅ", value: "္la" }, //后加
 	{ id: "ၼ", value: "္ma" }, //后加
-	{ id: "ွ", value: "္ha" }, //后加
+	{ id: "ွ", value: "္va" }, //后加
+	{ id: "ႇ", value: "္ha" }, //后加
 	{ id: "ႆ", value: "ssa" }, //后加
 	{ id: "ၷ", value: "na" }, //后加
 	{ id: "ၲ", value: "ta" }, //后加
@@ -266,6 +256,7 @@ var char_myn_to_roman_1 = [
 	{ id: "ၪ", value: "ñ" }, //後加
 	{ id: "a္", value: "" }, //後加
 	{ id: "္", value: "" }, //後加
+	{ id: "aံ", value: "aṃ" },
 
 	{ id: "ေss", value: "sse" }, //后加
 	{ id: "ေkh", value: "khe" }, //后加
@@ -462,7 +453,7 @@ var char_myn_to_roman_2 = [
 	{ id: "ိႇ", value: "ႇိ" }, //后加
 
 	{ id: "ျ", value: "္ra" }, //后加
-	{ id: "ွ", value: "္ha" }, //后加
+	{ id: "ွ", value: "္va" }, //后加
 	{ id: "ှ", value: "္ha" }, //后加
 	{ id: "ႇ", value: "္ha" }, //后加
 	{ id: "ြ", value: "္va" }, //后加
@@ -493,7 +484,7 @@ var char_myn_to_roman_2 = [
 	{ id: "်", value: "္ya" }, //后加
 	{ id: "ႅ", value: "္la" }, //后加
 	{ id: "ၼ", value: "္ma" }, //后加
-	{ id: "ွ", value: "္ha" }, //后加
+	{ id: "ွ", value: "္va" }, //后加
 	{ id: "ၲ", value: "ta" }, //后加
 
 	{ id: "ႆ", value: "ssa" }, //后加

public/app/public/charcode/myanmar.js

@@ -209,7 +209,8 @@ var char_myn_to_roman_1 = [
 	{ id: "ျ", value: "္ya" }, //后加
 	{ id: "ႅ", value: "္la" }, //后加
 	{ id: "ၼ", value: "္ma" }, //后加
-	{ id: "ွ", value: "္ha" }, //后加
+	{ id: "ွ", value: "္va" }, //后加
+	{ id: "ႇ", value: "္ha" }, //后加
 	{ id: "ႆ", value: "ssa" }, //后加
 	{ id: "ၷ", value: "na" }, //后加
 	{ id: "ၲ", value: "ta" }, //后加
@@ -452,7 +453,7 @@ var char_myn_to_roman_2 = [
 	{ id: "ိႇ", value: "ႇိ" }, //后加
 
 	{ id: "ျ", value: "္ra" }, //后加
-	{ id: "ွ", value: "္ha" }, //后加
+	{ id: "ွ", value: "္va" }, //后加
 	{ id: "ှ", value: "္ha" }, //后加
 	{ id: "ႇ", value: "္ha" }, //后加
 	{ id: "ြ", value: "္va" }, //后加
@@ -483,7 +484,7 @@ var char_myn_to_roman_2 = [
 	{ id: "်", value: "္ya" }, //后加
 	{ id: "ႅ", value: "္la" }, //后加
 	{ id: "ၼ", value: "္ma" }, //后加
-	{ id: "ွ", value: "္ha" }, //后加
+	{ id: "ွ", value: "္va" }, //后加
 	{ id: "ၲ", value: "ta" }, //后加
 
 	{ id: "ႆ", value: "ssa" }, //后加

public/app/public/charcode/tai_tham.js

@@ -1,4 +1,6 @@
 var char_roman_to_tai = [
+	{ id: "ndr", value: "nrd" },
+	{ id: "ntr", value: "nrt" },
 	{ id: "bbho", value: "ᨻᩮ᩠ᨽᩣ" },
 	{ id: "ccho", value: "ᨧᩮ᩠ᨨᩣ" },
 	{ id: "ddho", value: "ᨴᩮ᩠ᨵᩣ" },
@@ -54,7 +56,7 @@ var char_roman_to_tai = [
 	{ id: "kko", value: "ᨠᩮ᩠ᨠᩣ" },
 	{ id: "kro", value: "ᨠᩮ᩠ᩕᩣ" },
 	{ id: "mbo", value: "ᨾᩮ᩠ᨻᩣ" },
-	{ id: "mmo", value: "ᨾᩮ᩠ᨾᩣ" },
+	{ id: "mmo", value: "ᨾᩮᩜᩣ" },
 	{ id: "mpo", value: "ᨾᩮ᩠ᨷᩣ" },
 	{ id: "ndo", value: "ᨶᩮᩣ᩠ᨴ" },
 	{ id: "nno", value: "ᨶᩮᩣ᩠ᨶ" },
@@ -101,7 +103,7 @@ var char_roman_to_tai = [
 	{ id: "ñje", value: "ᨬᩮ᩠ᨩ" },
 	{ id: "kke", value: "ᨠᩮ᩠ᨠ" },
 	{ id: "ṅke", value: "ᩘᨠᩮ" },//  ᩘᩮ᩠ᨠ
-	{ id: "mme", value: "ᨾᩮ᩠ᨾ" },
+	{ id: "mme", value: "ᨾᩮᩜ" },
 	{ id: "nne", value: "ᨶᩮ᩠ᨶ" },
 	{ id: "ññe", value: "ᨬᩮ᩠ᨬ" },
 	{ id: "ṇṇe", value: "ᨱᩮ᩠ᨱ" },
@@ -180,6 +182,8 @@ var char_roman_to_tai = [
 { id: "r", value: "ᩁ᩠" },
 { id: "᩠v", value: "᩠ᩅ᩠" },
 { id: "v", value: "ᩅ᩠" },
+{ id: "᩠ᨾ", value: "ᩜ" },
+{ id: "᩠ai", value: "ᩱ" },
 { id: "᩠aṃ", value: "ᩴ" },
 { id: "᩠iṃ", value: "ᩥᩴ" },
 { id: "᩠uṃ", value: "ᩩᩴ" },
@@ -222,6 +226,7 @@ var char_roman_to_tai = [
 { id: "ᩘ ", value: "ᩘ" },
 { id: "ᨷ᩠ᨷᩤ", value: "ᨷ᩠ᨷᩣ" },
 { id: "ᨲ᩠ᩅᩤ", value: "ᨲ᩠ᩅᩣ" },
+{ id: "ᩈ᩠ᩅᩤ", value: "ᩈ᩠ᩅᩣ" },
 { id: "ᩮ᩠ᨷᩤ", value: "ᩮ᩠ᨷᩣ" },
 
 
@@ -287,6 +292,7 @@ var char_tai_to_roman = [
 	{ id: "ᨠᩮ᩠ᨠᩣ", value: "kko" },
 	{ id: "ᨠᩮ᩠ᩕᩣ", value: "kro" },
 	{ id: "ᨾᩮ᩠ᨻᩣ", value: "mbo" },
+	{ id: "ᨾᩮᩜᩣ", value: "mmo" },
 	{ id: "ᨾᩮ᩠ᨾᩣ", value: "mmo" },
 	{ id: "ᨾᩮ᩠ᨷᩣ", value: "mpo" },
 	{ id: "ᨶᩮᩣ᩠ᨴ", value: "ndo" },
@@ -334,6 +340,7 @@ var char_tai_to_roman = [
 	{ id: "ᨬᩮ᩠ᨩ", value: "ñje" },
 	{ id: "ᨠᩮ᩠ᨠ", value: "kke" },
 	{ id: "ᩘᨠᩮ", value: "ṅke" },
+	{ id: "ᨾᩮᩜ", value: "mmo" },
 	{ id: "ᨾᩮ᩠ᨾ", value: "mme" },
 	{ id: "ᨶᩮ᩠ᨶ", value: "nne" },
 	{ id: "ᨬᩮ᩠ᨬ", value: "ññe" },
@@ -359,6 +366,8 @@ var char_tai_to_roman = [
 	{ id: "ᨿᩮ᩠ᨿ", value: "yye" },
 	{ id: "ᨾᩜᩣ", value: "mmā" },
 
+	{ id: "ᩜ", value: "᩠ma" },
+	{ id: "ᩱ", value: "᩠ai" },
 	{ id: "ᩴ", value: "᩠aṃ" },
 	{ id: "ᩥᩴ", value: "᩠iṃ" },
 	{ id: "ᩩᩴ", value: "᩠uṃ" },
@@ -495,6 +504,8 @@ var char_tai_to_roman = [
 	{ id: "e᩠ā", value: "o" },
 	{ id: "a᩠", value: "" },
 	{ id: "᩠a", value: "" },
+	{ id: "nrd", value: "ndr" },
+	{ id: "nrt", value: "ntr" },
 
 ];
 

public/app/public/lang/default.json

@@ -655,6 +655,7 @@
 		"caus": "caus.",
 		"pass": "pass.",
 		"space": " ",
+		"channel_type": "channel type",
 		"": ""
 	},
 	"grammastr": [

public/app/public/lang/en.json

@@ -654,6 +654,7 @@
 		"caus": "caus.",
 		"pass": "pass.",
 		"space": " ",
+		"channel_type": "channel type",
 		"": ""
 	},
 	"grammastr": [

public/app/public/lang/my.json

@@ -5,116 +5,104 @@
 		"accessed": "Accessed",
 		"add_to_edit_list": "Add to Edit List",
 		"adhivacana": "Adhivacana",
-		"all": "All",
-		"all_select": "All",
+		"all": "အားလုံး",
 		"all_data!": "All Data!",
 		"all_done": "Looking up accomplished",
 		"allsplit": "Words Splited Successfully ^-^",
-		"and_another": " and ",
 		"append": "Append",
 		"apply": "Apply",
-		"applyto": "Apply to",
-		"arrival_in_detail": "arrival in detail",
+		"applyto": "လျှောက်သည်။တောင်းခံသည်။ကျင့်သုံးသည်။",
 		"asc": "ASC",
-		"atitude": "Atitude",
 		"audio": "Audio",
-		"author": "Author",
+		"author": "Author:",
 		"auto": "AUTO",
-		"auto_fill": "Automatic filling",
+		"auto_fill": "အလိုလျှောက်ဖြည့်ခြင်း",
 		"back": "back",
-		"base_on": "Base on",
-		"BE": "Buddhist Era ",
+		"base_on": "Base on:",
+		"BE": "သာသနာတော်နှစ်",
 		"bhumma": "ဘုမ္မ",
 		"book": "book",
 		"book_mark": "Book Mark",
-		"book_name": "book name ",
+		"book_name": "book name",
 		"bookmark": "bookmark...",
 		"buddhist_calendar": "Buddhist Calendar",
 		"budha": "ဗုဓ",
-		"by": "By",
-		"cancel": "ဖျက်သိမ်းသည်",
+		"by": "By:",
+		"cancel": "ပယ်ဖျက်ပါ",
 		"canda": "စန္ဒ",
 		"caption": "Caption",
 		"CE": "CE",
-		"change_position": "change position",
 		"chars": "Chars",
 		"checking": "scanning",
-		"children": "Children",
-		"chinese": "中文",
+		"children": "ကလေးများ",
+		"chinese": "တရုတ်ဘာသာ",
 		"click_on": "Click On",
 		"click_word_to": "click word to ",
 		"code_convert": "Code Convert",
-		"color": "Color",
-		"column_compare": "ပေါ် & အောက်",
+		"color": "အရောင်",
+		"column_compare": "Up & Down",
 		"commentary": "Commentary",
 		"completely_delete": "completely delete",
 		"computer": "Computer",
-		"confirm": "Confirm",
-		"content": "မာတိကာ",
-		"contents": "မာတိကာ",
+		"content": "Content",
+		"contents": "Contents",
 		"copy": "copy",
-		"copy_to_clipboard": "copy the link to clipboard",
 		"creat_a_new_file_by_yourself": "Creat a new file by yourself",
 		"created": "Created",
-		"current": "Current",
+		"current": "လက်ရှိ",
 		"database_admin": "Database Admin",
-		"date": "Date ",
-		"day": " ",
-		"day_1": " ",
-		"days": " day(s) ",
+		"date": "ရက်စွဲ",
+		"day": "",
+		"day_1": "",
+		"days": " နေ့များ ",
 		"debug": "Debug",
-		"delete": "Delete",
-		"departure_in_detail": "departure in detail",
+		"delete": "ဖျက်ပါ",
 		"desc": "DESC",
-		"detaile": "Detail",
-		"dhamma_time": "5000 Years of the Buddha’s Dispensation ",
+		"detaile": "Detaile",
+		"dhamma_time": "ဗုဒ္ဓ သာသနာတော်နှစ် ၅၀၀၀",
 		"dict": "Dict",
 		"dict_match": "Match the Dictionary and Document",
 		"dict_terms": "Terms",
 		"dictionary": "အဘိဓာန်",
 		"dictionary_match_result": "Dictionary Match Result",
-		"dictsouce": "Source of Terms",
-		"difficulty": "difficulty level",
+		"dictsouce": "Dictionary Resouce",
+		"difficulty": "ခက်ခဲမှုအတိုင်းအတာ",
 		"done": " scanned",
-		"down": "Down",
+		"down": "အောက်",
 		"download": "[Download]",
-		"draft": "As Draft",
-		"dawn": "dawn",
-		"each_paragraph": "paragraph",
-		"each_sentence": "ဝါကျကဏ္ဍ",
-		"eat": "eat",
-		"edit": "Edit",
-		"edit_now": "Edit in Studio",
+		"dwan": "အရုဏ်တက်ချိန်",
+		"eat": "စားသည်",
+		"edit": "တည်းဖြတ်ပါ",
+		"edit_now": "Edit Now",
 		"edit1": "Edited By ",
-		"edition": "Edition ",
-		"editor": "Editor",
-		"e_mail": "E-mail",
+		"edition": "Edition: ",
+		"editor": "Editor:",
+		"e-mail": "E-mail",
 		"empty": "Empty",
 		"empty_the_data_below": "Empty the Data Below",
 		"empty_the_recycle_bin": "Empty the Recycle Bin",
 		"empty1": "EMPTY",
-		"english": "English",
+		"english": "အင်္ဂလိပ်ဘာသာ",
 		"export": "Export",
 		"export_csv": "Export CSV",
 		"export_html": "Export HTML",
-		"f_mean": "F-Mean",
 		"factor": "Factor",
 		"factors_input": "input factors by click",
-		"favorite": "favorite",
-		"file_name": "File Name",
+		"file_name": "File Name:",
 		"files": " files",
 		"find_replace": "Find & Replace",
 		"finish": "Finish",
-		"finished": "finished",
+		"finished": "ပြီးပြီ",
+		"f-mean": "F-Mean",
 		"g_mean": "G-Mean",
-		"gama_entry": "entry the village",
-		"gramma": "Grammar",
-		"gramma_case": "Grammar Case",
+		"gama_entry": "ရွာအတွင်းသို့ဝင်သည်",
+		"gramma": "သဒ္ဒါ",
+		"gramma_case": "Gramma Case",
 		"guid_creator": "GUID Creator",
 		"guru": "ဂုရု",
 		"h": "(h)",
 		"half": "half",
-		"heading": "Heading",
+		"heading": "ခေါင်းစဉ်",
 		"heading_1": "Heading 1",
 		"heading_2": "Heading 2",
 		"heading_3": "Heading 3",
@@ -131,11 +119,10 @@
 		"heading_lv6": "Heading Lv6",
 		"heading_lv7": "Heading Lv7",
 		"heading_lv8": "Heading Lv8",
-		"hidden": "hide",
+		"hidden": "hidden",
 		"home": "Home",
-		"hori_ref_time": "horizontal refraction correct ",
 		"html_text_data": "HTML Text Data",
-		"import": "Import ",
+		"import": "Import",
 		"import_csv": "Import CSV",
 		"import_export": "Import/Export",
 		"import_the_flie_from_cscd": "Import the flie From Cattha Sangayana data base",
@@ -147,122 +134,117 @@
 		"input": "input",
 		"kala": "ကာလ",
 		"keywords": "Keywords",
-		"language": "ဘာသာ",
-		"language_select": "ဘာသာ",
+		"language": "Language:",
 		"layout": "Layout",
-		"left": "Remains ",
-		"lesson": "သင်တန်း",
+		"left": "Remains",
+		"lesson": "lesson",
 		"letters": " letters",
 		"level": "Lv",
 		"list": "List",
-		"load": "Load",
+		"load": "ထည့်သွင်း",
 		"load_from_database": "Load From Database",
 		"load_from_wbw_file": "Load From WBW File",
-		"loading": "loading…",
+		"loading": "အလုပ်လုပ်နေသည်",
 		"loading_dictionary_list...": "loading Dictionary List...",
-		"lock": "Lock",
-		"login": "Login",
-		"logout": "Logout",
-		"longitude": "Longitude",
+		"lock": "သော့ခတ်ပါ",
+		"login": "ဝင်မည်",
+		"logout": "ထွက်မည်",
 		"magic_dict": "Magic Dict",
 		"magic_gap": "Magic Gap",
 		"magic_split": "Magic Split",
 		"magic_terms": "Magic Terms",
 		"main_code": "Main Code",
-		"mark": "Mark",
+		"mark": "အမှတ်အသား",
 		"māsa": "မာသ",
 		"match_end": "Document update over，Degree of Perfection",
 		"matched": "Matched",
 		"max": "Max",
-		"meaning": "Meaning",
+		"meaning": "အဓိပ္ပာယ်",
 		"meaning_input": "input meanings by click",
 		"message": "message",
-		"min": "min",
-		"mins": "(min)",
+		"min": "(min)",
 		"mobile": "Mobile",
 		"modified": "Modified",
 		"modify": "Modify",
 		"modifyok": "Modified ",
-		"month": "Month ",
-		"month_1": "- ",
-		"months": " month(s) ",
+		"month": "လ",
+		"month_1": "-",
+		"months": " လများနှင့် ",
 		"more": "more",
 		"my_book": "My Book",
 		"my_dictionary": "My Dictionary",
 		"my_document": "My Document",
-		"my_loc": "အတ္တသ္မိံ",
-		"name": "Name",
-		"need_inform": "without informing other Bhikkhu ",
-		"new": "New",
-		"new_account": "New Account",
-		"new_project": "New Word by Word Analysis",
+		"name": "အမည်",
+		"need_inform": "အခြားရဟန်းများအား အသိမပေးဘဲ ",
+		"new": "အသစ်",
+		"new_account": "အကောင့်အသစ်",
+		"new_project": "New Project",
 		"new_revision": "New Revision",
 		"new_technic_term": "New Technic Term",
 		"newheading": "Text Editor",
-		"newproject": "New Project",
-		"newword": "New Word",
-		"night": "Night",
+		"newproject": "စနစ်သစ်",
+		"newword": "စကားလုံးအသစ်",
+		"night": "ည",
 		"no.": "No.",
 		"no_related_file": "No related file",
-		"no_string": "cannot ",
+		"no_string": "မလုပ်နိုင်ပါ ",
 		"nofilename": "No File Name",
 		"noon_time": "မဇ္ဈန္ဟိက",
 		"normal": "Normal",
-		"note": "Note",
+		"note": "မှတ်စု",
 		"now_time": "ပစ္စုပ္ပန္န",
 		"num_k": "K",
 		"num_m": "M",
-		"ok": "OK",
+		"ok": "အိုကေ",
 		"order_by": "Order By",
-		"other": "Other ",
+		"other": "Other",
 		"other_meaning": "other meaning",
-		"otherdict": "Other Dictionary",
-		"pa_auk_dictionary": "Pa-auk Dictionary",
+		"otherdict": "အခြားအဘိဓာန်",
+		"pa-auk_dictionary": "Pa-auk Dictionary",
 		"pacchā_māsa": "ပစ္ဆာ-မာသ",
-		"pakkha": "Lunar Phases ",
-		"pāli": "ပါဠိ",
-		"pali_canon": "တိပိဋက",
+		"pakkha": "Lunar Phases",
+		"pāli": "Pāli",
+		"pali_canon": "ပါဠိတော်",
 		"pāli_code": "Pāli Code",
-		"para": " Paragraphs",
+		"para": " စာပိုဒ်များ",
 		"paragraph": "Paragraph",
-		"parent": "Parent",
+		"parent": "မိဘ",
 		"parent_input": "input parent by click",
-		"part": "Factors",
+		"part": "တစ်စိတ်တစ်ပိုင်း",
 		"partmeaning": "Factor-Meaning",
-		"password": "Password",
+		"password": "စကားဝှက်",
 		"password_again": "Password again",
-		"past": "Passed ",
+		"past": "Passed",
 		"pcd_studio": "PCD Studio ",
 		"piṭaka": "Piṭaka",
 		"plugin": "Plugin",
-		"poweredby": "Powered by PCSD  build27-Jul-2018",
+		"poweredby": "Powered by PCSD   build:27-Jul-2018",
 		"preview": "preview",
 		"print": "Print",
 		"print_preview": "Print Preview",
-		"product": "translation words",
+		"product": "စကားလုံးများကို ဘာသာပြန်ခြင်း",
 		"project": "Project",
 		"protection": "Protection【en】",
 		"pubba_māsa": "ပုဗ္ဗ-မာသ",
 		"publish": "Publish",
 		"ravi": "ရဝိ",
-		"read": "စာဖတ်",
-		"read_only": "Read Only",
+		"read": "ဖတ်မည်",
+		"read_only": "ဖတ်ရုံသာ",
 		"recent_scan": "Recent Scan",
 		"recycle_bin": "Recycle Bin",
-		"ref_dict": "Dictionary",
+		"ref_dict": "အဘိဓာန်",
 		"refresh": "Refresh",
-		"relation": "အတ္ထယောဇနာ",
 		"remove": "Remove",
-		"removeword": "Slur Factor Removed",
+		"remove//new": "Remove//new",
+		"removeword": "sandhi Factor Removed",
 		"render": "Render",
-		"repeat": "Repeat Quotiety ",
+		"repeat": "Repeat Quotiety: ",
 		"resource": "Resource",
 		"revision": "Revised By ",
 		"revision_mode": "Revision Mode",
-		"round_1": "Round ",
+		"round_1": "အကြိမ် ",
 		"round_2": " dictionary",
-		"row_compare": "ဘယ် & ညာ",
-		"same_word": "same words",
+		"row_compare": "Left & Right",
 		"saṃvacchara": "သံဝစ္ဆရ",
 		"sandhi": "Sandhi",
 		"sandhi_begin": "Sandhi Begin",
@@ -270,94 +252,92 @@
 		"sandhi_end": "Sandhi End",
 		"sandhi_orginal_word": "Sandhi Orginal Word",
 		"sandhi_splited_word": "Sandhi Splited Word",
-		"save": "သိမ်းထားသည",
+		"save": "သိမ်းမည်",
 		"script": "Script",
 		"search": "Search",
-		"season": "Season ",
-		"sec": "sec ",
-		"sent_trans": "Translate of Sentence",
+		"season": "ရာသီ",
+		"sec": "sec",
+		"sent_trans": "စာကြောင်းကို ဘာသာပြန်ပါ",
 		"sentence": "Sentence",
 		"sentence_by_sentence": "Sentence By Sentence",
+		"serach": "serach",
 		"setting": "Setting",
 		"share": "share",
 		"shared": "shared",
-		"show": "Show",
+		"show": "ပြပါ:",
 		"similar_words": "Similar Words",
 		"size": "size",
 		"smart_spell": "smart spell",
 		"sora": "သောရ",
 		"source": "Source",
-		"spell": "spell",
+		"spell": "စာလုံးပေါင်းပါ:",
 		"statistical_data": "statistical data",
 		"style": "Style",
 		"sub_pcode": "Sub Code",
-		"subversion": "Subversion",
-		"success": " Words Successfully",
-		"successful": "Successful",
+		"subversion": "Subversion:",
+		"success": " Words Successfully",
+		"successful": "အောင်မြင်သော",
 		"sukka": "သုက္က",
-		"sun_height_degree": "Max solar altitude ",
 		"system_default": "System Default",
 		"system_dictionary": "System Dictionary",
 		"tag": "tag",
 		"templet": "Templet",
-		"terms_system": "Terms System",
-		"thischapter": "This Chapter",
-		"time": "Time",
+		"thischapter": "ဤအခန်း",
+		"time": "time",
 		"title": "title ",
 		"to_the_dhamma": " to the Dhamma ",
-		"today": "Today ",
+		"today": "ယနေ့ ",
 		"toDB": "To User Database",
 		"tools": "Tools",
 		"total": "Total ",
 		"total_workload": "total workload",
 		"totally": "Totally ",
-		"tran_workload": "whole passage translate ",
-		"translate": "စကားပြန်",
+		"tran_workload": "whole passage translate: ",
+		"translate": "ဘာသာပြန်သည်",
 		"translate_convert": "Translate Convert",
-		"translate1": "Translated By ",
+		"translate1": "ဘာသာပြန်ပြီး",
 		"translation": "Translation",
 		"translation_templet": "Translation Templet",
 		"twilight_time": "အရုဏုဂ္ဂမန",
 		"undo_shared": "undo shared",
-		"unsplit": "Slur Splited",
-		"up": "Up",
-		"up_and_down": "ပေါ် And အောက်",
+		"unsplit": "sandhi Splited",
+		"up": "အထက်",
+		"up_and_down": "အထက်နှင့်အောက်",
 		"update_all_wbw_to_database": "Update All WBW to Database",
 		"user": "User",
-		"to_user_dictionary": "သိမ်းထားသည & Add to My Vocabulary List",
+		"user_dictionary": "User Dictionary",
 		"user_id": "User ID",
-		"userdict": "Vocabulary List",
+		"userdict": "User Dictionary",
 		"vannana": "vaṇṇanā",
-		"view": "View",
+		"view": "မြင်ကွင်း",
 		"vikala": "ဝိကာလ",
-		"vocabulary": "Vocabulary ",
-		"wbw": "Word by Word Analysis",
-		"week": "(week)",
-		"week_day": "Day",
+		"vocabulary": "ဝေါဟာရ: ",
+		"wbw": "တစ်လုံးချင်းစီအတွက်သုံးသပ်ချက်",
+		"week": "(ရက်သတ္တပတ်)",
+		"week_day": "နေ့",
 		"welcome": "Welcome ",
-		"white": "White",
+		"white": "အဖြူ",
 		"wiki_term": "Wiki Term",
 		"with_title": "With Title",
 		"wizard": "Wizard",
 		"wizard_my_book": "Wizard -> My Book",
 		"word_base": "Word base",
 		"word_by_word": "Word by Word",
-		"word_gramma_statistics": "Word & Grammar Statistics",
+		"word_gramma_statistics": "Word & Gramma Statistics",
 		"word_length": "average word length",
 		"word_list": "Word List",
 		"word_note": "Word Note",
-		"word_selection_apply_to": "Word Selection Apply to",
+		"word_selection_apply_to": "Word Selection Apply to:",
 		"wordmap": "Word Tree",
-		"wordnum": "Text Amount ",
+		"wordnum": "Text Amount: ",
 		"words": " words",
-		"wordtype": "Word Type",
+		"wordtype": "စကားလုံးအမျိုးအစား",
 		"workload": "workload",
 		"xml_data": "XML Data",
-		"year": "(year)",
-		"year_0": "year",
-		"year_1": "- ",
-		"years": " year(s) ",
-		"yes_string": "can ",
+		"year": "(နှစ်)",
+		"year_1": "-",
+		"years": " နှစ်များ ",
+		"yes_string": "လုပ်နိုင်သည် ",
 		"continue": "continue",
 		"account": "Username",
 		"new_to_wikipali": "New to Wikipāḷi",
@@ -654,6 +634,7 @@
 		"caus": "caus.",
 		"pass": "pass.",
 		"space": " ",
+		"channel_type": "channel type",
 		"": ""
 	},
 	"grammastr": [

public/app/public/lang/si.json

@@ -659,6 +659,7 @@
 		"caus": "caus.",
 		"pass": "pass.",
 		"space": " ",
+		"channel_type": "channel type",
 		"": ""
 	},
 	"grammastr": [

public/app/public/lang/zh-cn.json

@@ -657,6 +657,7 @@
 		"caus": "使役",
 		"pass": "被动",
 		"space": "",
+		"channel_type": "资源类型",
 		"": ""
 	},
 	"grammastr": [

public/app/public/lang/zh-tw.json

@@ -655,6 +655,7 @@
 		"error_net_parsererror": "數據解析錯誤",
 		"caus": "使役",
 		"pass": "被動",
+		"channel_type": "資源類型",
 		"space": "",
 		"": ""
 	},

public/app/studio/js/relation_list.js

@@ -137,7 +137,7 @@ var list_relation=[
     {
         "id": "NIO",
         "case": ".nom.",
-        "note": "被描述 ➡ 定性<br>XX有…",
+        "note": "被描述(主) ➡ 定性(表)<br>XX即……",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -164,7 +164,7 @@ var list_relation=[
     {
         "id": "NID",
         "case": ".nom.",
-        "note": "待命名 ➡ 命名<br>XX叫做…",
+        "note": "待命名(主) ➡ 命名(表)<br>XX叫做…",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -1423,7 +1423,7 @@ var list_relation=[
     },
     {
         "id": "ENU",
-        "case": ".adv.",
+        "case": "",
         "note": "enumerative relation",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
@@ -1432,7 +1432,7 @@ var list_relation=[
     },
     {
         "id": "ENU",
-        "case": ".adv.",
+        "case": "",
         "note": "罗列 ➡ 破折号",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
@@ -1441,7 +1441,7 @@ var list_relation=[
     },
     {
         "id": "ENU",
-        "case": ".adv.",
+        "case": "",
         "note": "enumerative relation",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",

public/app/studio/js/relation_list.json

@@ -1,4 +1,4 @@
-var list_relation=[
+[
     {
         "id": "IAD",
         "case": "",

public/app/term/note.js

@@ -1339,27 +1339,27 @@ function myEndingTooltip(inStr){
         {
             id:"my_dat1",
             name:"အား",
-            tooltip:'为格/对象(间接宾语)',
+            tooltip:'目的格/对象(间接宾语)，对……来说',
         },
         {
             id:"my_dat2",
             name:"ငှာ",
-            tooltip:'为格/目的(为了)',
+            tooltip:'目的格/表示目的，为了……',
         },
         {
             id:"my_abl1",
             name:"မှ",
-            tooltip:'从格/从',
+            tooltip:'从格/表示来源，从……',
         },
         {
             id:"my_abl2",
             name:"အောက်",
-            tooltip:'从格/比……多',
+            tooltip:'从格/表达比较，比……多',
         },
         {
             id:"my_abl3",
             name:"ထက်",
-            tooltip:'从格/比……少',
+            tooltip:'从格/表达比较，比……少',
         },
         {
             id:"my_gen1",
@@ -1369,7 +1369,7 @@ function myEndingTooltip(inStr){
         {
             id:"my_gen2",
             name:"တွင်",
-            tooltip:'属格/处(范围)',
+            tooltip:'属格/表达范围，……中的',
         },
         {
             id:"my_loc1",
@@ -1379,7 +1379,7 @@ function myEndingTooltip(inStr){
         {
             id:"my_loc2",
             name:"ကြောင့်",
-            tooltip:'处格/因',
+            tooltip:'处格/表达动机，因……，旨在……',
         },
         {
             id:"my_abs",

public/app/users_guide/zh-cn/grammar_fut.md

@@ -12,6 +12,6 @@
 
 |将来时|单数|复数|
 | -- | -- | -- |
-|第三人称|~(i)ssati<br>TA**将**~|~(i)ssanti<br>TA们**将**~|
-|第二人称|~(i)ssasi<br>你**将**~|~(i)ssatha<br>你们**将**~|
-|第一人称|~(i)ssāmi<br>我**将**~|~(i)ssāma<br>我们**将**~|
+|第三人称|-(i)ssati<br>TA**将**…|-(i)ssanti<br>TA们**将**…|
+|第二人称|-(i)ssasi<br>你**将**…|-(i)ssatha<br>你们**将**…|
+|第一人称|-(i)ssāmi<br>我**将**…|-(i)ssāma<br>我们**将**…|

public/app/users_guide/zh-cn/grammar_my_abl1.md

@@ -1,3 +1,3 @@
 # 缅文语尾
 
-- 从格/从
+- 来**源**格/表达来源，从……

public/app/users_guide/zh-cn/grammar_my_abl2.md

@@ -1,3 +1,3 @@
 # 缅文语尾
 
-- 从格/比……多
+- 来**源**格/表达比较，比……多

public/app/users_guide/zh-cn/grammar_my_abl3.md

@@ -1,3 +1,3 @@
 # 缅文语尾
 
-- 从格/比……少
+- 来**源**格/表达比较，比……少

public/app/users_guide/zh-cn/grammar_my_acc1.md

@@ -1,3 +1,3 @@
 # 缅文语尾
 
-- 宾格/宾语
+- **宾**格/宾语

public/app/users_guide/zh-cn/grammar_my_dat1.md

@@ -1,3 +1,3 @@
 # 缅文语尾
 
-- 为格/对象(间接宾语)
+- 目的格/表达动作对象(间接宾语)，向……，对……来说

public/app/users_guide/zh-cn/grammar_my_dat2.md

@@ -1,3 +1,3 @@
 # 缅文语尾
 
-- 为格/目的(为了)
+- 目的格/表达目的，为了……

public/app/users_guide/zh-cn/grammar_my_gen1.md

@@ -1,3 +1,4 @@
 # 缅文语尾
 
-- 属格/的
+- 名词：属格/表达从属，……的
+- 句子结尾：放在首要动词之后

public/app/users_guide/zh-cn/grammar_my_gen2.md

@@ -1,4 +1,4 @@
 # 缅文语尾
 
-- 处格/处(范围)
-- 属格/处(范围)
+- 处格/表达范围，……处
+- 属格/表达范围，……中的

public/app/users_guide/zh-cn/grammar_my_inst1.md

@@ -1,3 +1,3 @@
 # 缅文语尾
 
-- 具格/用
+- 具格/表达方式，用……，以……

public/app/users_guide/zh-cn/grammar_my_inst2.md

@@ -1,3 +1,3 @@
 # 缅文语尾
 
-- 具格/与
+- 具格/表达连带，与……

public/app/users_guide/zh-cn/grammar_my_inst3.md

@@ -1,4 +1,10 @@
 # 缅文语尾
 
-- 具格/凭借
-- 从格/原因
+表示原因，有以下可能：
+
+|可能的情况|翻译建议|
+|-|-|
+|[工**具**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/instr/instr-cau.html)|根据……|
+|[来**源**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/abl/abl-cau.html)|由于……|
+|[引号**iti**](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/other/iti.html#%E5%8E%9F%E5%9B%A0%E7%8A%B6%E8%AF%ADcausative-particle)|因为……|
+|[**连续**体](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/verb/ger.html#%E4%BE%8B%E5%8F%A53)|基于……|

public/app/users_guide/zh-cn/grammar_my_loc2.md

@@ -1,3 +1,3 @@
 # 缅文语尾
 
-- 处格/因
+- 处格/表达动机，因……，旨在……

public/app/users_guide/zh-cn/grammar_pres.md

@@ -13,7 +13,7 @@
 
 |现在时|单数|复数|
 | -- | -- | -- |
-|第三人称|~ti<br>TA**正在**~|~nti<br>TA们**正在**~|
-|第二人称|~si<br>你**正在**~|~tha<br>你们**正在**~|
-|第一人称|~āmi<br>我**正在**~|~āma<br>我们**正在**~|
+|第三人称|-ti<br>TA**正在**…|-nti<br>TA们**正在**…|
+|第二人称|-si<br>你**正在**…|-tha<br>你们**正在**…|
+|第一人称|-āmi<br>我**正在**…|-āma<br>我们**正在**…|
 

resources/views/wbwanalyses.blade.php

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+    <body>
+        <h1>逐词解析数据分析</h1>
+        <table>
+        @foreach($data as $row)
+        <tr>
+        <td>{{ $row->d1 }}</td>
+        <td>{{ $row->data }}</td>
+        <td style='width:500px;'><span style='display:inline-block;width:{{ $row->ct }}px;background-color:green;'>{{ $row->ct }}</span></td>
+        </tr>
+        @endforeach
+        </table>
+
+        <script>
+        var app = @json($data);
+        </script>
+    </body>
+</html>

routes/web.php

@@ -2,6 +2,8 @@
 
 use Illuminate\Support\Facades\Route;
 use App\Http\Controllers\SentenceInfoController;
+use App\Http\Controllers\WbwAnalysisController;
+
 /*
 |--------------------------------------------------------------------------
 | Web Routes
@@ -25,5 +27,8 @@ Route::get('/home/{name}', function ($name) {
     return view('home', ['name' => $name]);
 });
 
+
 Route::get('/api/sentence/progress/image', [SentenceInfoController::class,'showprogress']);
-Route::get('/api/sentence/progress/daily/image', [SentenceInfoController::class,'showprogressdaily']);
+Route::get('/api/sentence/progress/daily/image', [SentenceInfoController::class,'showprogressdaily']);
+Route::get('/wbwanalyses', [WbwAnalysisController::class,'index']);
+