|
|
@@ -130,17 +130,30 @@ for($i=0;$i<$lookup_loop;$i++)
|
|
|
else{
|
|
|
$guid = "";
|
|
|
}
|
|
|
+ if(isset($one["lang"])){
|
|
|
+ $language = $one["lang"];
|
|
|
+ }
|
|
|
+ else if(isset($one["language"])){
|
|
|
+ $language = $one["language"];
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ $language = "en";
|
|
|
+ }
|
|
|
+
|
|
|
$pali = $one["pali"];
|
|
|
$dict_word_spell["{$pali}"]=1;
|
|
|
$type = $one["type"];
|
|
|
$gramma = $one["gramma"];
|
|
|
$parent = $one["parent"];
|
|
|
- if(inLangSetting($one["lang"],$user_setting["dict.lang"])){
|
|
|
+ //$mean = $one["mean"];
|
|
|
+
|
|
|
+ if(inLangSetting($language,$user_setting["dict.lang"])){
|
|
|
$mean = $one["mean"];
|
|
|
}
|
|
|
else{
|
|
|
$mean = "";
|
|
|
}
|
|
|
+
|
|
|
$note = $one["note"];
|
|
|
if(isset($one["factors"])){
|
|
|
$parts = $one["factors"];
|
|
|
@@ -161,16 +174,18 @@ for($i=0;$i<$lookup_loop;$i++)
|
|
|
else{
|
|
|
$partmean = "";
|
|
|
}
|
|
|
- if(inLangSetting($one["lang"],$user_setting["dict.lang"])==false){
|
|
|
+
|
|
|
+ if(inLangSetting($language,$user_setting["dict.lang"])==false){
|
|
|
$partmean = "";
|
|
|
}
|
|
|
+
|
|
|
$status = $one["status"];
|
|
|
if(isset($one["confidence"])){
|
|
|
$confidence = $one["confidence"];
|
|
|
}
|
|
|
else{
|
|
|
$confidence = 100;
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
if(isset($one["dict_name"])){
|
|
|
$dict_name = $one["dict_name"];
|
|
|
@@ -179,12 +194,7 @@ for($i=0;$i<$lookup_loop;$i++)
|
|
|
$dict_name = "";
|
|
|
}
|
|
|
|
|
|
- if(isset($one["lang"])){
|
|
|
- $language = $one["lang"];
|
|
|
- }
|
|
|
- else{
|
|
|
- $language = "en";
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
array_push($output,array(
|
|
|
"id"=>$id,
|