Merge branch 'master' of https://github.com/visuddhinanda/mint

app/calendar/README.md

@@ -0,0 +1,225 @@
+
+SunCalc
+=======
+
+[![Build Status](https://travis-ci.org/mourner/suncalc.svg?branch=master)](https://travis-ci.org/mourner/suncalc)
+
+SunCalc is a tiny BSD-licensed JavaScript library for calculating sun position,
+sunlight phases (times for sunrise, sunset, dusk, etc.),
+moon position and lunar phase for the given location and time,
+created by [Vladimir Agafonkin](http://agafonkin.com/en) ([@mourner](https://github.com/mourner))
+as a part of the [SunCalc.net project](http://suncalc.net).
+
+Most calculations are based on the formulas given in the excellent Astronomy Answers articles
+about [position of the sun](http://aa.quae.nl/en/reken/zonpositie.html)
+and [the planets](http://aa.quae.nl/en/reken/hemelpositie.html).
+You can read about different twilight phases calculated by SunCalc
+in the [Twilight article on Wikipedia](http://en.wikipedia.org/wiki/Twilight).
+
+
+## Usage example
+
+```javascript
+// get today's sunlight times for London
+// 获取当天伦敦的太阳时间参数
+var times = SunCalc.getTimes(new Date(), 51.5, -0.1);// 经度，纬度 
+
+// format sunrise time from the Date object
+// 从Date对象格式化日出时间 hh:mm
+var sunriseStr = times.sunrise.getHours() + ':' + times.sunrise.getMinutes();
+
+// get position of the sun (azimuth and altitude) at today's sunrise
+// 获取今天日出时太阳的位置（当地经度，当地纬度）
+var sunrisePos = SunCalc.getPosition(times.sunrise, 51.5, -0.1);
+
+// get sunrise azimuth in degrees
+// 得到太阳方位角
+var sunriseAzimuth = sunrisePos.azimuth * 180 / Math.PI;
+```
+
+SunCalc is also available as an NPM package:
+SunCalc也可以作为NPM软件包提供：
+
+```bash
+$ npm install suncalc
+```
+
+```js
+var SunCalc = require('suncalc');
+```
+
+
+## Reference调用
+
+### Sunlight times 太阳时间
+
+```javascript
+SunCalc.getTimes(/*Date*/ date, /*Number*/ latitude, /*Number*/ longitude, /*Number (default=0)*/ height)
+SunCalc.getTimes(/*日期*/ date, /*纬度*/ latitude, /*经度*/ longitude, /*海拔高度（千米） (default=0)*/ height)
+```
+
+Returns an object with the following properties (each is a `Date` object):
+
+返回一个对象具有一下属性（每一个都是一个`Date`对象）
+
+| Property属性    | Description描述                                                                                            |
+| --------------- | ---------------------------------------------------------------------------------------------------------- |
+| `sunrise`       | sunrise 日出(top edge of the sun appears on the horizon  日轮上缘出现在地平线)                             |
+| `sunriseEnd`    | sunrise ends 日出结束(bottom edge of the sun touches the horizon    日轮下缘触及地平线)                    |
+| `goldenHourEnd` | 朝霞结束morning golden hour (soft light, best time for photography) ends                                   |
+| `solarNoon`     | 正午solar noon (sun is in the highest position 太阳位于高度角达到最高)                                     |
+| `goldenHour`    | evening golden hour starts  晚霞开始                                                                       |
+| `sunsetStart`   | sunset starts 日落开始 (bottom edge of the sun touches the horizon 日轮下缘触及地平线)                     |
+| `sunset`        | sunset 日落(sun disappears below the horizon, evening civil twilight starts日轮上缘消失在地平线，夜幕降临) |
+| `dusk`          | dusk 暮色 (evening nautical twilight starts 航海夜幕开始)                                                  |
+| `nauticalDusk`  | nautical dusk 航海暮色 (evening astronomical twilight starts 天文夜幕开始)                                 |
+| `night`         | night starts 入夜 (dark enough for astronomical observations夜色足够黑暗可以进行天文学观察)                |
+| `nadir`         | nadir天底 (darkest moment of the night, sun is in the lowest position 夜晚的至暗之时，太阳位于最低点)      |
+| `nightEnd`      | night ends夜尽 (morning astronomical twilight starts 天文曙光开始)                                         |
+| `nauticalDawn`  | nautical dawn 航海曙光 (morning nautical twilight starts 航海曙光开始)                                     |
+| `dawn`          | dawn 破晓(morning nautical twilight ends, morning civil twilight starts航海曙光结束，民用曙光开始)         |
+
+```javascript
+SunCalc.addTime(/*Number*/ angleInDegrees, /*String*/ morningName, /*String*/ eveningName)
+```
+
+Adds a custom time when the sun reaches the given angle to results returned by `SunCalc.getTimes`.
+
+当太阳到达给定角度时，通过`SunCalc.getTimes`将自定义时间添加到返回的结果中。
+
+`SunCalc.times` property contains all currently defined times.
+`SunCalc.times`属性包含了所有当前已定义的时间
+
+### Sun position太阳位置
+
+```javascript
+SunCalc.getPosition(/*Date*/ timeAndDate, /*Number*/ latitude, /*Number*/ longitude)
+```
+
+Returns an object with the following properties:
+
+ * `altitude`: sun altitude above the horizon in radians,太阳高度（以弧度为单位）
+ e.g. `0` at the horizon and `PI/2` at the zenith (straight over your head)
+ `0`为地平线 `PI/2`为天顶
+ * `azimuth`: sun azimuth in radians (direction along the horizon, measured from south to west),太阳弧度（以弧度为单位）（地平线的投影方向，从南到西测量），
+ e.g. `0` is south and `Math.PI * 3/4` is northwest
+- `0`为正南
+- `Math.PI * 1/4`为西南
+- `Math.PI * 1/2`为正西
+- `Math.PI * 3/4` 西北
+- `Math.PI` 为正北
+
+
+### Moon position
+
+```javascript
+SunCalc.getMoonPosition(/*Date*/ timeAndDate, /*Number*/ latitude, /*Number*/ longitude)
+```
+
+Returns an object with the following properties:
+
+ * `altitude`: moon altitude above the horizon in radians  月亮高度（弧度）
+ * `azimuth`: moon azimuth in radians 月亮水平偏移（弧度）
+ * `distance`: distance to moon in kilometers 地月距离（千米）
+ * `parallacticAngle`: parallactic angle of the moon in radians 月亮的视差角（弧度）
+
+
+### Moon illumination月轮亮度
+
+```javascript
+SunCalc.getMoonIllumination(/*Date*/ timeAndDate)
+```
+
+Returns an object with the following properties:
+返回一个具有以下属性的对象
+ * `fraction`: illuminated fraction of the moon; varies from `0.0` (new moon) to `1.0` (full moon)
+ * 月亮照亮的部分，从`0.0`到`1.0`变化
+ * `phase`: moon phase; varies from `0.0` to `1.0`, described below
+ * 月相；从`0.0`到`1.0`变化，描述如下
+ * `angle`: midpoint angle in radians of the illuminated limb of the moon reckoned eastward from the north point of the disk;
+ the moon is waxing if the angle is negative, and waning if positive
+* 通过月亮照亮的部分从圆盘的正北向东偏移的角度（以弧度计）的中点；如果角度为负，则月亮在变亮；如果角度为正，则月亮在变暗
+
+Moon phase value should be interpreted like this:
+月相值的解释如下：
+
+| Phase相 | Name                     |
+| ------: | ------------------------ |
+|       0 | New Moon 新月            |
+|         | Waxing Crescent 凹月渐亮 |
+|    0.25 | First Quarter 上弦月     |
+|         | Waxing Gibbous 凸月渐满  |
+|     0.5 | Full Moon 满月           |
+|         | Waning Gibbous 满月渐小  |
+|    0.75 | Last Quarter 下弦月      |
+|         | Waning Crescent 凹月渐暗 |
+
+By subtracting the `parallacticAngle` from the `angle` one can get the zenith angle of the moons bright limb (anticlockwise).
+The zenith angle can be used do draw the moon shape from the observers perspective (e.g. moon lying on its back).
+
+### Moon rise and set times
+
+```js
+SunCalc.getMoonTimes(/*Date*/ date, /*Number*/ latitude, /*Number*/ longitude[, inUTC])
+```
+
+Returns an object with the following properties:
+
+ * `rise`: moonrise time as `Date`
+ * `set`: moonset time as `Date`
+ * `alwaysUp`: `true` if the moon never rises/sets and is always _above_ the horizon during the day
+ * `alwaysDown`: `true` if the moon is always _below_ the horizon
+
+By default, it will search for moon rise and set during local user's day (frou 0 to 24 hours).
+If `inUTC` is set to true, it will instead search the specified date from 0 to 24 UTC hours.
+
+## Changelog
+
+#### 1.8.0 — Dec 22, 2016
+
+- Improved precision of moonrise/moonset calculations.
+- Added `parallacticAngle` calculation to `getMoonPosition`.
+- Default to today's date in `getMoonIllumination`.
+- Fixed incompatibility when using Browserify/Webpack together with a global AMD loader.
+
+#### 1.7.0 — Nov 11, 2015
+
+- Added `inUTC` argument to `getMoonTimes`.
+
+#### 1.6.0 — Oct 27, 2014
+
+- Added `SunCalc.getMoonTimes` for calculating moon rise and set times.
+
+#### 1.5.1 — May 16, 2014
+
+- Exposed `SunCalc.times` property with defined daylight times.
+- Slightly improved `SunCalc.getTimes` performance.
+
+#### 1.4.0 — Apr 10, 2014
+
+- Added `phase` to `SunCalc.getMoonIllumination` results (moon phase).
+- Switched from mocha to tape for tests.
+
+#### 1.3.0 — Feb 21, 2014
+
+- Added `SunCalc.getMoonIllumination` (in place of `getMoonFraction`) that returns an object with `fraction` and `angle`
+(angle of illuminated limb of the moon).
+
+#### 1.2.0 — Mar 07, 2013
+
+- Added `SunCalc.getMoonFraction` function that returns illuminated fraction of the moon.
+
+#### 1.1.0 — Mar 06, 2013
+
+- Added `SunCalc.getMoonPosition` function.
+- Added nadir (darkest time of the day, middle of the night).
+- Added tests.
+
+#### 1.0.0 — Dec 07, 2011
+
+- Published to NPM.
+- Added `SunCalc.addTime` function.
+
+#### 0.0.0 — Aug 25, 2011
+
+- First commit.

app/calendar/index.php

@@ -61,14 +61,14 @@ $dir_app="../studio/";
 	<link type="text/css" rel="stylesheet" href="<?php echo $dir_app; ?>css/style.css"/>
 	<link type="text/css" rel="stylesheet" href="<?php echo $dir_app; ?>css/color_day.css" id="colorchange" />
 	<link type="text/css" rel="stylesheet" href="<?php echo $dir_app; ?>css/style.css"/>
-	<title><?php echo $_local->gui->pcd_studio;?></title>
+	<title><?php echo $_local->gui->BE;?></title>
 	<script src="<?php echo $dir_app; ?>js/jquery-3.3.1.min.js"></script>
 <!--	<script language="javascript" src="<?php echo $dir_app; ?>charcode/sinhala.js"></script>
 	<script language="javascript" src="<?php echo $dir_app; ?>charcode/myanmar.js"></script>
 	<script language="javascript" src="<?php echo $dir_app; ?>charcode/unicode.js"></script>
 -->
 <script>
-		<?php 
+	<?php 
 	//加载js语言包
 	require_once '../public/load_lang_js.php';
 	?>
@@ -149,7 +149,7 @@ input[type="date"]{
 		}
 
 
-			var g_langrage="en";
+			var g_language="en";
 function setCookie(c_name,value,expiredays)
 {
 	var exdate=new Date()
@@ -806,9 +806,9 @@ function set_time_string(date_obj){
 	return(hh+":"+mm+":"+ss)
 }
 function menuLangrage(obj,year,month){
-	g_langrage=obj.value;
-	setCookie('language',g_langrage,365);
-	window.location.assign("index.php?language="+g_langrage+"&y="+year+"&m="+month);
+	g_language=obj.value;
+	setCookie('language',g_language,365);
+	window.location.assign("index.php?language="+g_language+"&y="+year+"&m="+month);
 
 }
 set_uposatha_day();

app/calendar/index1.html

@@ -0,0 +1,551 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link type="text/css" rel="stylesheet" href="../pcdl/css/font.css" />
+    <link type="text/css" rel="stylesheet" href="../pcdl/css/basic_style.css" />
+    <link type="text/css" rel="stylesheet" href="../pcdl/css/style.css" />
+    <link type="text/css" rel="stylesheet" href="../pcdl/css/color_day.css" id="colorchange" />
+    <link type="text/css" rel="stylesheet" href="../pcdl/css/style_mobile.css" media="screen and (max-width:767px)">
+
+    <script src="../public/js/jquery.js"></script>
+    <script src="../public/js/comm.js"></script>
+    <script src="jquery-3.3.1.min.js"></script>
+    <script src="suncalc.js"></script>
+    <script src="../studio/js/fixedsticky.js"></script>
+    <script src="../guide/guide.js"></script>
+    <link type="text/css" rel="stylesheet" href="../guide/guide.css" />
+
+    <script src="../public/js/marked.js"></script>
+    <!--获取语言-->
+    <script>
+        var g_language = "en";
+        var g_currLink = "";
+        function lang_init(strPage) {
+            g_currLink = strPage;
+        }
+        function setLang(strLang) {
+            g_language = strLang;
+            setCookie('language', g_language, 365);
+            window.location.assign(location.pathname + "?language=" + g_language);
+        }
+    </script>
+    <script>
+        var localString = new Array();
+        localString["zh-cn"] = {
+            "and_another": "又 ",
+            "atitude": "纬度",
+            "BE": "佛历",
+            "bhumma": "周二",
+            "budha": "周三",
+            "canda": "周一",
+            "confirm": "确认",
+            "date": "日期",
+            "day": "日",
+            "days": "天 ",
+            "departure_in_detail": "起飞详情",
+            "dhamma_time": "会延续五千年的教法 ",
+            "eat": "进餐",
+            "gama_entry": "入村",
+            "guru": "周四",
+            "hori_ref_time": "蒙气差修正 ",
+            "kala": "适当的时间",
+            "language_select": "选择语言",
+            "left": "还剩下",
+            "loading": "载入中……",
+            "longitude": "经度",
+            "māsa": "月",
+            "mins": "分钟",
+            "month": "月 ",
+            "month_1": "月 ",
+            "months": "个月 ",
+            "my_loc": "我的位置",
+            "need_inform": "未告知其他比库",
+            "no_string": "不能",
+            "noon_time": "正午",
+            "noon_time": "正午",
+            "note": "注释",
+            "now_time": "现在",
+            "pacchā_māsa": "下个月",
+            "pakkha": "月相变化 ",
+            "past": "已过去",
+            "pubba_māsa": "上个月",
+            "ravi": "周日",
+            "saṃvacchara": "年",
+            "season": "季节 ",
+            "sec": "秒",
+            "sora": "周六",
+            "sukka": "周五",
+            "sun_height_degree": "正午太阳高度 ",
+            "time": "时间",
+            "twilight_time": "曙光",
+            "twilight_time": "曙光",
+            "vikala": "不适当的时间",
+            "week_day": "星期",
+            "year_0": "年",
+            "year_1": "年 ",
+            "years": "年 ",
+            "yes_string": "可以"
+        };
+        localString["zh-tw"] = {
+            "and_another": "又 ",
+            "atitude": "緯度",
+            "BE": "佛曆",
+            "bhumma": "週二",
+            "budha": "週三",
+            "canda": "週一",
+            "confirm": "確認",
+            "date": "日期",
+            "day": "日",
+            "days": "天 ",
+            "departure_in_detail": "起飛詳情",
+            "dhamma_time": "會延續五千年的教法 ",
+            "eat": "進餐",
+            "gama_entry": "入村",
+            "guru": "週四",
+            "hori_ref_time": "蒙氣差修正 ",
+            "kala": "適當的時間",
+            "language_select": "選擇語言",
+            "left": "還剩下",
+            "loading": "載入中……",
+            "longitude": "經度",
+            "māsa": "月",
+            "mins": "分鐘",
+            "month": "月 ",
+            "month_1": "月 ",
+            "months": "個月 ",
+            "my_loc": "我的位置",
+            "need_inform": "未告知其他比庫",
+            "no_string": "不能",
+            "noon_time": "正午",
+            "noon_time": "正午",
+            "note": "註釋",
+            "now_time": "現在",
+            "pacchā_māsa": "下個月",
+            "pakkha": "月相變化 ",
+            "past": "已過去",
+            "pubba_māsa": "上個月",
+            "ravi": "週日",
+            "saṃvacchara": "年",
+            "season": "季節 ",
+            "sec": "秒",
+            "sora": "週六",
+            "sukka": "週五",
+            "sun_height_degree": "正午太陽高度 ",
+            "time": "時間",
+            "twilight_time": "曙光",
+            "twilight_time": "曙光",
+            "vikala": "不適當的時間",
+            "week_day": "星期",
+            "year_0": "年",
+            "year_1": "年 ",
+            "years": "年 ",
+            "yes_string": "可以"
+        };
+        localString["default"] = {
+            "and_another": " and ",
+            "atitude": "Atitude",
+            "BE": "Buddhist Era ",
+            "bhumma": "Bhumma",
+            "budha": "Budha",
+            "canda": "Canda",
+            "confirm": "Confirm",
+            "date": "Date ",
+            "day": " day(s) ",
+            "days": " day(s) ",
+            "departure_in_detail": "departure in detail",
+            "dhamma_time": "5000 Years of the Buddha’s Dispensation ",
+            "eat": "eat",
+            "gama_entry": "entry the village",
+            "guru": "Guru",
+            "hori_ref_time": "horizontal refraction correct ",
+            "kala": "suitable time",
+            "language_select": "bhāsā",
+            "left": "Remains ",
+            "loading": "loading…",
+            "longitude": "Longitude",
+            "māsa": "māsa",
+            "mins": "(min)",
+            "month": "Month ",
+            "month_1": "- ",
+            "months": " month(s) ",
+            "my_loc": "attasmiṃ",
+            "need_inform": "without informing other Bhikkhu ",
+            "no_string": "cannot ",
+            "noon_time": "NOON",
+            "noon_time": "NOON",
+            "note": "Note",
+            "now_time": "NOW",
+            "pacchā_māsa": "pacchā-māsa",
+            "pakkha": "Lunar Phases ",
+            "past": "Passed ",
+            "pubba_māsa": "pubba-māsa",
+            "ravi": "Ravi",
+            "saṃvacchara": "saṃvacchara",
+            "season": "Season ",
+            "sec": "sec ",
+            "sora": "Sora",
+            "sukka": "Sukka",
+            "sun_height_degree": "Max solar altitude ",
+            "time": "Time",
+            "twilight_time": "dawn",
+            "twilight_time": "dawn",
+            "vikala": "unsuitable time",
+            "week_day": "Day",
+            "year_0": "saṃvacchara",
+            "year_1": "- ",
+            "years": " year(s) ",
+            "yes_string": "can "
+        };
+        localString["en"] = {
+            "and_another": " and ",
+            "atitude": "Atitude",
+            "BE": "Buddhist Era ",
+            "bhumma": "Bhumma",
+            "budha": "Budha",
+            "canda": "Canda",
+            "confirm": "Confirm",
+            "date": "Date",
+            "day": " day(s) ",
+            "days": " day(s) ",
+            "departure_in_detail": "departure in detail",
+            "dhamma_time": "5000 Years of the Buddha’s Dispensation ",
+            "eat": "eat",
+            "gama_entry": "entry the village",
+            "guru": "Guru",
+            "hori_ref_time": "horizontal refraction correct ",
+            "kala": "suitable time",
+            "language_select": "Language",
+            "left": "Remains ",
+            "loading": "loading…",
+            "longitude": "Longitude",
+            "māsa": "māsa",
+            "mins": "(min)",
+            "month": "Month ",
+            "month_1": "- ",
+            "months": " month(s) ",
+            "my_loc": "my location",
+            "need_inform": "without informing other Bhikkhu ",
+            "no_string": "cannot ",
+            "noon_time": "NOON",
+            "noon_time": "NOON",
+            "note": "Note",
+            "now_time": "NOW",
+            "pacchā_māsa": "pacchā-māsa",
+            "pakkha": "Lunar Phases ",
+            "past": "Passed ",
+            "pubba_māsa": "pubba-māsa",
+            "ravi": "Ravi",
+            "saṃvacchara": "saṃvacchara",
+            "season": "Season ",
+            "sec": "sec",
+            "sora": "Sora",
+            "sukka": "Sukka",
+            "sun_height_degree": "Max solar altitude ",
+            "time": "time",
+            "twilight_time": "dawn",
+            "twilight_time": "dawn",
+            "vikala": "unsuitable time",
+            "week_day": "Day",
+            "year_0": "year",
+            "year_1": "- ",
+            "years": " year(s) ",
+            "yes_string": "can "
+        };
+        localString["my"] = {
+            "and_another": " and ",
+            "atitude": "Atitude",
+            "BE": "Buddhist Era ",
+            "bhumma": "ဘုမ္မ",
+            "budha": "ဗုဓ",
+            "canda": "စန္ဒ",
+            "confirm": "Confirm",
+            "date": "Date ",
+            "day": " day(s) ",
+            "days": " day(s) ",
+            "departure_in_detail": "departure in detail",
+            "dhamma_time": "5000 Years of the Buddha’s Dispensation ",
+            "eat": "eat",
+            "gama_entry": "entry the village",
+            "guru": "ဂုရု",
+            "hori_ref_time": "horizontal refraction correct ",
+            "kala": "ကာလ",
+            "language_select": "ဘာသာ",
+            "left": "Remains ",
+            "loading": "loading…",
+            "longitude": "Longitude",
+            "māsa": "မာသ",
+            "mins": "(min)",
+            "month": "Month ",
+            "month_1": "- ",
+            "months": " month(s) ",
+            "my_loc": "အတ္တသ္မိံ",
+            "need_inform": "without informing other Bhikkhu ",
+            "no_string": "cannot ",
+            "noon_time": "မဇ္ဈန္ဟိက",
+            "noon_time": "မဇ္ဈန္ဟိက",
+            "note": "Note",
+            "now_time": "ပစ္စုပ္ပန္န",
+            "pacchā_māsa": "ပစ္ဆာ-မာသ",
+            "pakkha": "Lunar Phases ",
+            "past": "Passed ",
+            "pubba_māsa": "ပုဗ္ဗ-မာသ",
+            "ravi": "ရဝိ",
+            "saṃvacchara": "သံဝစ္ဆရ",
+            "season": "Season ",
+            "sec": "sec ",
+            "sora": "သောရ",
+            "sukka": "သုက္က",
+            "sun_height_degree": "Max solar altitude ",
+            "time": "Time",
+            "twilight_time": "အရုဏုဂ္ဂမန",
+            "twilight_time": "အရုဏုဂ္ဂမန",
+            "vikala": "ဝိကာလ",
+            "week_day": "Day",
+            "year_0": "year",
+            "year_1": "- ",
+            "years": " year(s) ",
+            "yes_string": "can "
+        };
+        localString["si"] = {
+            "and_another": " ච ",
+            "atitude": "Atitude",
+            "BE": "බුද්ධ වර්ෂය ",
+            "bhumma": "භුම්ම",
+            "budha": "බුධ",
+            "canda": "චන්ද",
+            "confirm": "Confirm",
+            "date": "දිවස ",
+            "day": " දිවසා(නි) ",
+            "days": " දිවසා(නි) ",
+            "departure_in_detail": "departure in detail",
+            "dhamma_time": "සම්මා සම්බුද්ධස්ස සාසනං පට්ච-වස්ස-සහස්සානි පවත්තිස්සති ",
+            "eat": "eat",
+            "gama_entry": "entry the village",
+            "guru": "ගු‍රු",
+            "hori_ref_time": "horizontal refraction correct ",
+            "kala": "කාල",
+            "language_select": "භාෂාව",
+            "left": "අවසිට්ඨ ",
+            "loading": "ප්‍රවේශනය වෙනවා ",
+            "longitude": "Longitude",
+            "māsa": "මාස",
+            "mins": "(min)",
+            "month": "මාස ",
+            "month_1": "- ",
+            "months": " මාසා(නි) ",
+            "my_loc": "අත‍්තස‍්මිං",
+            "need_inform": "without informing other Bhikkhu ",
+            "no_string": "cannot ",
+            "noon_time": "මජ්ඣන්හික",
+            "noon_time": "මජ්ඣන්හික",
+            "note": "නෝට්ටුව ",
+            "now_time": "පච්චුප්පන්න",
+            "pacchā_māsa": "පච්ඡා-මාස",
+            "pakkha": "පක්ඛ ",
+            "past": "අතික්කන්ත ",
+            "pubba_māsa": "පුබ්බ-මාස",
+            "ravi": "රවි",
+            "saṃvacchara": "සංවච්ඡ‍ර",
+            "season": "උතු ",
+            "sec": "sec",
+            "sora": "සො‍ර",
+            "sukka": "සුක්ක",
+            "sun_height_degree": "Max solar altitude ",
+            "time": "time",
+            "twilight_time": "අ‍රුණුග්ගමන",
+            "twilight_time": "අ‍රුණුග්ගමන",
+            "vikala": "විකාල",
+            "week_day": "වා‍ර ",
+            "year_0": "සංවච්ඡ‍ර",
+            "year_1": "- ",
+            "years": " සංවච්ඡ‍රා(නි) ",
+            "yes_string": "can "
+        };
+
+
+    </script>
+    <style>
+        .card {
+            box-shadow: 0 0 10px rgba(0, 0, 0, 0.15);
+            font-size: 1em;
+            line-height: 1.3;
+        }
+
+        .card>.title>a,
+        .card>.title>a:link {
+            color: var(--main-color);
+        }
+
+        .card a:hover {
+            color: var(--tool-link-hover-color);
+        }
+
+        .index_inner {
+            width: 960px;
+            margin-left: auto;
+            margin-right: auto;
+        }
+    </style>
+    <title id='title_text'>
+    </title>
+</head>
+
+<body>
+    <!--多语言范例
+        <script>
+            document.write(localString["language"].XXXX);
+        </script>
+
+    -->
+    <div id='position_change'>
+        <span id='selected_position_string'>
+            <script>
+                document.write(localString[g_language].loading);
+                //localString[g_language].loading;
+            </script>
+        </span>
+        <!--自动定位-->
+        <button onclick='getLocation()' style='font-size: 100%; padding: 2px 6px;'>
+            <svg class='icon' style='min-width: 1.8em; min-height: 1.8em;'>
+                <path
+                    d='M12 8c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm8.94 3A8.994 8.994 0 0 0 13 3.06V1h-2v2.06A8.994 8.994 0 0 0 3.06 11H1v2h2.06A8.994 8.994 0 0 0 11 20.94V23h2v-2.06A8.994 8.994 0 0 0 20.94 13H23v-2h-2.06zM12 19c-3.87 0-7-3.13-7-7s3.13-7 7-7 7 3.13 7 7-3.13 7-7 7z' />
+            </svg>
+            <script>
+                document.write(localString[g_language].my_loc);
+                //localString[g_language].my_loc
+            </script>
+        </button>
+        <input id="input_time" type="datetime-local">
+    </div>
+    <div>
+        <div onclick="show_time()">Sun time table</div>
+        <div><span id="today_dawn"></span></div>
+        <div><span id="today_solarNoon"></span></div>
+        <div><span id="today_sunset"></span></div>
+        <div>月相<span id="today_moon_phase"></span></div>
+        <div>南偏西<span id="today_sun_azimuth"></span></div>
+        <div>北偏东<span id="today_moon_azimuth"></span></div>
+        <div>日月角<span id="angle_sun_e_moon"></span></div>
+        <div>月相角<span id="today_moon_angle"></span></div>
+
+
+    </div>
+    <script>
+        $("#title_text").html(localString[g_language].BE);
+        var g_coordinate_this = new Object();
+        var today = new Date();
+        var sun_times = new Object();
+        var curr_position = localStorage.getItem("local_position");
+        if (curr_position) {
+            g_coordinate_this.AT = curr_position.split("#")[0];
+            g_coordinate_this.LT = curr_position.split("#")[1];
+            if (g_coordinate_this.AT >= 0) {
+                var AT_string = angle_trans(g_coordinate_this.AT) + "N";
+            }
+            else {
+                var AT_string = angle_trans(g_coordinate_this.AT) + "S";
+            }
+            if (g_coordinate_this.LT >= 0) {
+                var LT_string = angle_trans(g_coordinate_this.LT) + "E";
+            }
+            else {
+                var LT_string = angle_trans(g_coordinate_this.LT) + "W";
+            }
+            $("#selected_position_string").html(AT_string + " " + LT_string);
+
+        }
+        else {
+            getLocation();
+        }
+        function show_time() {
+            if ($("#input_time").val()) {
+                today = new Date($("#input_time").val());
+            }
+            sun_times = SunCalc.getTimes(today, g_coordinate_this.AT, g_coordinate_this.LT, 0);
+            sun_position = SunCalc.getPosition(today, g_coordinate_this.AT, g_coordinate_this.LT);
+            moon_position = SunCalc.getMoonPosition(today, g_coordinate_this.AT, g_coordinate_this.LT);
+            moon_Illumination = SunCalc.getMoonIllumination(today)
+            $("#today_dawn").html(sun_times.dawn.toLocaleTimeString());
+            $("#today_solarNoon").html(sun_times.solarNoon.toLocaleTimeString());
+            $("#today_sunset").html(sun_times.sunset.toLocaleTimeString());
+            $("#today_sun_azimuth").html(angle_trans(sun_position.azimuth / Math.PI * 180));//太阳水平弧度
+            $("#today_moon_azimuth").html(angle_trans(moon_position.azimuth / Math.PI * 180));//月亮水平弧度
+            $("#today_moon_phase").html(1 - 2 * moon_Illumination.phase);//月相值
+            $("#today_moon_angle").html(angle_trans(moon_Illumination.angle / Math.PI * 180));//月相角
+            $("#angle_sun_e_moon").html(angle_trans(Math.abs(Math.PI + sun_position.azimuth - moon_position.azimuth) / Math.PI * 180));//月亮水平弧度
+
+
+        }
+
+        function getLocation() {//自动定位
+            if (navigator.geolocation) {
+                navigator.geolocation.getCurrentPosition(showPosition, showError);
+            }
+            else {
+                $("#selected_position_string").html("Geolocation is not supported by this browser.");
+            }
+        }
+        function showPosition(position) {
+            alert("get cordinate success");
+            g_coordinate_this.AT = position.coords.latitude;
+            g_coordinate_this.LT = position.coords.longitude;
+            let position_string = g_coordinate_this.AT + "#" + g_coordinate_this.LT
+            localStorage.setItem("local_position", position_string);
+
+            if (g_coordinate_this.AT >= 0) {
+                var AT_string = angle_trans(g_coordinate_this.AT) + "N";
+            }
+            else {
+                var AT_string = angle_trans(g_coordinate_this.AT) + "S";
+            }
+            if (g_coordinate_this.LT >= 0) {
+                var LT_string = angle_trans(g_coordinate_this.LT) + "E";
+            }
+            else {
+                var LT_string = angle_trans(g_coordinate_this.LT) + "W";
+            }
+            $("#selected_position_string").html(AT_string + " " + LT_string);
+
+        }
+        function showError(error) {
+            switch (error.code) {
+                case error.PERMISSION_DENIED:
+                    alert("定位失败,用户拒绝请求地理定位");
+                    break;
+                case error.POSITION_UNAVAILABLE:
+                    alert("定位失败,位置信息是不可用");
+                    break;
+                case error.TIMEOUT:
+                    alert("定位失败,请求获取用户位置超时");
+                    break;
+                case error.UNKNOWN_ERROR:
+                    alert("定位失败,定位系统失效");
+                    break;
+            }
+        }
+        function angle_trans(angle) {
+            var angle_str = "";
+            var num_d = Math.floor(angle);
+            var num_m = Math.floor((angle - num_d) * 60);
+            var num_s = Math.round((angle - num_d) * 60 - num_m);
+            if (num_d != 0) {
+                angle_str += num_d + "°";
+            }
+            if (num_m != 0) {
+                angle_str += num_m + "’";
+            }
+            if (num_s != 0) {
+                angle_str += num_s + "”";
+            }
+            return (angle_str);
+        }
+
+    </script>
+
+
+</body>
+
+</html>

app/calendar/suncalc.js

@@ -0,0 +1,326 @@
+/*
+ (c) 2011-2015, Vladimir Agafonkin
+ SunCalc is a JavaScript library for calculating sun/moon position and light phases.
+ https://github.com/mourner/suncalc
+*/
+
+(function () { 'use strict';
+
+// shortcuts for easier to read formulas 公式易读快捷方式
+
+var PI   = Math.PI,
+    sin  = Math.sin,
+    cos  = Math.cos,
+    tan  = Math.tan,
+    asin = Math.asin,
+    atan = Math.atan2,
+    acos = Math.acos,
+    rad  = PI / 180;
+
+// sun calculations are based on http://aa.quae.nl/en/reken/zonpositie.html formulas
+// 太阳计算基于 http://aa.quae.nl/en/reken/zonpositie.html 上的公式
+
+// date/time constants and conversions 日期/时间常量和转换
+
+var dayMs = 1000 * 60 * 60 * 24,//一天的毫秒数
+    J1970 = 2440588,
+    J2000 = 2451545;
+
+function toJulian(date) { return date.valueOf() / dayMs - 0.5 + J1970; }
+function fromJulian(j)  { return new Date((j + 0.5 - J1970) * dayMs); }
+function toDays(date)   { return toJulian(date) - J2000; }
+
+
+// general calculations for position 通用位置计算
+
+var e = rad * 23.4397; // obliquity of the Earth
+
+function rightAscension(l, b) { return atan(sin(l) * cos(e) - tan(b) * sin(e), cos(l)); }
+function declination(l, b)    { return asin(sin(b) * cos(e) + cos(b) * sin(e) * sin(l)); }
+//方位角
+function azimuth(H, phi, dec)  { return atan(sin(H), cos(H) * sin(phi) - tan(dec) * cos(phi)); }
+//高度角
+function altitude(H, phi, dec) { return asin(sin(phi) * sin(dec) + cos(phi) * cos(dec) * cos(H)); }
+
+function siderealTime(d, lw) { return rad * (280.16 + 360.9856235 * d) - lw; }
+
+function astroRefraction(h) {
+    if (h < 0) // the following formula works for positive altitudes only.
+        h = 0; // if h = -0.08901179 a div/0 would occur.
+
+    // formula 16.4 of "Astronomical Algorithms" 2nd edition by Jean Meeus (Willmann-Bell, Richmond) 1998.
+    // 1.02 / tan(h + 10.26 / (h + 5.10)) h in degrees, result in arc minutes -> converted to rad:
+    return 0.0002967 / Math.tan(h + 0.00312536 / (h + 0.08901179));
+}
+
+// general sun calculations 通用太阳计算
+
+function solarMeanAnomaly(d) { return rad * (357.5291 + 0.98560028 * d); }
+
+function eclipticLongitude(M) {
+
+    var C = rad * (1.9148 * sin(M) + 0.02 * sin(2 * M) + 0.0003 * sin(3 * M)), // equation of center 中心差
+        P = rad * 102.9372; // perihelion of the Earth 地球近日点
+
+    return M + C + P + PI;
+}
+
+function sunCoords(d) {
+
+    var M = solarMeanAnomaly(d),
+        L = eclipticLongitude(M);
+
+    return {
+        dec: declination(L, 0),
+        ra: rightAscension(L, 0)
+    };
+}
+
+
+var SunCalc = {};
+
+
+// calculates sun position for a given date and latitude/longitude 根据给定的日期与经纬度计算太阳位置
+
+SunCalc.getPosition = function (date, lat, lng) {
+
+    var lw  = rad * -lng,
+        phi = rad * lat,
+        d   = toDays(date),
+
+        c  = sunCoords(d),
+        H  = siderealTime(d, lw) - c.ra;
+
+    return {
+        azimuth: azimuth(H, phi, c.dec),
+        altitude: altitude(H, phi, c.dec)
+    };
+};
+
+
+// sun times configuration (angle, morning name, evening name) 太阳时间配置（高度，晨名，昏名）
+
+var times = SunCalc.times = [
+    [-0.833, 'sunrise',       'sunset'      ], //日出，日落
+    [  -0.3, 'sunriseEnd',    'sunsetStart' ], //日出结束，日落开始
+    [-6.833, 'dawn',          'dusk'        ], //曙光升起，夜幕降临(修正蒙气差)
+    [   -12, 'nauticalDawn',  'nauticalDusk'], //航海曙光，航海暮光
+    [   -18, 'nightEnd',      'night'       ], //夜尽，入夜
+    [     6, 'goldenHourEnd', 'goldenHour'  ]  //朝霞结束，晚霞开始
+];
+
+// adds a custom time to the times config 在时间配置中添加自定义时间
+
+SunCalc.addTime = function (angle, riseName, setName) {
+    times.push([angle, riseName, setName]);
+};
+
+
+// calculations for sun times 计算太阳时
+
+var J0 = 0.0009;
+
+function julianCycle(d, lw) { return Math.round(d - J0 - lw / (2 * PI)); }
+
+function approxTransit(Ht, lw, n) { return J0 + (Ht + lw) / (2 * PI) + n; }
+function solarTransitJ(ds, M, L)  { return J2000 + ds + 0.0053 * sin(M) - 0.0069 * sin(2 * L); }
+
+function hourAngle(h, phi, d) { return acos((sin(h) - sin(phi) * sin(d)) / (cos(phi) * cos(d))); }
+function observerAngle(height) { return -2.076 * Math.sqrt(height) / 60; }
+
+// returns set time for the given sun altitude 返回给定太阳高度的设置时间
+function getSetJ(h, lw, phi, dec, n, M, L) {
+
+    var w = hourAngle(h, phi, dec),
+        a = approxTransit(w, lw, n);
+    return solarTransitJ(a, M, L);
+}
+
+
+// calculates sun times for a given date, latitude/longitude, and, optionally,
+// 计算给定日期，纬度/经度的太阳时间，以及（可选）
+// the observer height (in meters) relative to the horizon
+// 观察者相对于地平线的高度（以米为单位）
+
+SunCalc.getTimes = function (date, lat, lng, height) {
+
+    height = height || 0;
+
+    var lw = rad * -lng,
+        phi = rad * lat,
+
+        dh = observerAngle(height),
+
+        d = toDays(date),
+        n = julianCycle(d, lw),
+        ds = approxTransit(0, lw, n),
+
+        M = solarMeanAnomaly(ds),
+        L = eclipticLongitude(M),
+        dec = declination(L, 0),
+
+        Jnoon = solarTransitJ(ds, M, L),
+
+        i, len, time, h0, Jset, Jrise;
+
+
+    var result = {
+        solarNoon: fromJulian(Jnoon),
+        nadir: fromJulian(Jnoon - 0.5)
+    };
+
+    for (i = 0, len = times.length; i < len; i += 1) {
+        time = times[i];
+        h0 = (time[0] + dh) * rad;
+
+        Jset = getSetJ(h0, lw, phi, dec, n, M, L);
+        Jrise = Jnoon - (Jset - Jnoon);
+
+        result[time[1]] = fromJulian(Jrise);
+        result[time[2]] = fromJulian(Jset);
+    }
+
+    return result;
+};
+
+
+// moon calculations, based on http://aa.quae.nl/en/reken/hemelpositie.html formulas
+// 月亮计算，基于 http://aa.quae.nl/en/reken/hemelpositie.html 上的公式
+function moonCoords(d) { // geocentric ecliptic coordinates of the moon 月球的地心黄道坐标
+
+    var L = rad * (218.316 + 13.176396 * d), // ecliptic longitude 黄道经度
+        M = rad * (134.963 + 13.064993 * d), // mean anomaly 平均异常
+        F = rad * (93.272 + 13.229350 * d),  // mean distance 平均距离
+
+        l  = L + rad * 6.289 * sin(M), // longitude 经度
+        b  = rad * 5.128 * sin(F),     // latitude 纬度
+        dt = 385001 - 20905 * cos(M);  // distance to the moon in km 地月距离
+
+    return {
+        ra: rightAscension(l, b),
+        dec: declination(l, b),
+        dist: dt
+    };
+}
+
+SunCalc.getMoonPosition = function (date, lat, lng) {
+
+    var lw  = rad * -lng,
+        phi = rad * lat,
+        d   = toDays(date),
+
+        c = moonCoords(d),
+        H = siderealTime(d, lw) - c.ra,
+        h = altitude(H, phi, c.dec),
+        // formula 14.1 of "Astronomical Algorithms" 2nd edition by Jean Meeus (Willmann-Bell, Richmond) 1998.
+        // 公式14.1——“Astronomical Algorithms” 第二版 Jean Meeus (Willmann-Bell, Richmond) 1998
+        pa = atan(sin(H), tan(phi) * cos(c.dec) - sin(c.dec) * cos(H));
+
+    h = h + astroRefraction(h); // altitude correction for refraction 折射高度修正
+
+    return {
+        azimuth: azimuth(H, phi, c.dec),
+        altitude: h,
+        distance: c.dist,
+        parallacticAngle: pa
+    };
+};
+
+
+// calculations for illumination parameters of the moon, 计算月球的照明参数，
+// based on http://idlastro.gsfc.nasa.gov/ftp/pro/astro/mphase.pro formulas and
+// 基于 http://idlastro.gsfc.nasa.gov/ftp/pro/astro/mphase.pro 上的公式
+// Chapter 48 of "Astronomical Algorithms" 2nd edition by Jean Meeus (Willmann-Bell, Richmond) 1998.
+// 第48章 ——“Astronomical Algorithms” 第二版 Jean Meeus (Willmann-Bell, Richmond) 1998
+
+SunCalc.getMoonIllumination = function (date) {
+
+    var d = toDays(date || new Date()),
+        s = sunCoords(d),
+        m = moonCoords(d),
+
+        sdist = 149598000, // distance from Earth to Sun in km 地日距离（单位：千米）
+
+        phi = acos(sin(s.dec) * sin(m.dec) + cos(s.dec) * cos(m.dec) * cos(s.ra - m.ra)),
+        inc = atan(sdist * sin(phi), m.dist - sdist * cos(phi)),
+        angle = atan(cos(s.dec) * sin(s.ra - m.ra), sin(s.dec) * cos(m.dec) -
+                cos(s.dec) * sin(m.dec) * cos(s.ra - m.ra));
+
+    return {
+        fraction: (1 + cos(inc)) / 2,
+        phase: 0.5 + 0.5 * inc * (angle < 0 ? -1 : 1) / Math.PI,
+        angle: angle
+    };
+};
+
+
+function hoursLater(date, h) {
+    return new Date(date.valueOf() + h * dayMs / 24);
+}
+
+// calculations for moon rise/set times are based on http://www.stargazing.net/kepler/moonrise.html article
+// 计算月亮升起和落下的实践，基于 http://www.stargazing.net/kepler/moonrise.html 上的文章
+
+SunCalc.getMoonTimes = function (date, lat, lng, inUTC) {
+    var t = new Date(date);
+    if (inUTC) t.setUTCHours(0, 0, 0, 0);
+    else t.setHours(0, 0, 0, 0);
+
+    var hc = 0.133 * rad,
+        h0 = SunCalc.getMoonPosition(t, lat, lng).altitude - hc,
+        h1, h2, rise, set, a, b, xe, ye, d, roots, x1, x2, dx;
+
+    // go in 2-hour chunks, each time seeing if a 3-point quadratic curve crosses zero (which means rise or set)
+    // 进行2小时的测试，每次查看3点二次曲线是否过零（表示上升或下降）
+    for (var i = 1; i <= 24; i += 2) {
+        h1 = SunCalc.getMoonPosition(hoursLater(t, i), lat, lng).altitude - hc;
+        h2 = SunCalc.getMoonPosition(hoursLater(t, i + 1), lat, lng).altitude - hc;
+
+        a = (h0 + h2) / 2 - h1;
+        b = (h2 - h0) / 2;
+        xe = -b / (2 * a);
+        ye = (a * xe + b) * xe + h1;
+        d = b * b - 4 * a * h1;
+        roots = 0;
+
+        if (d >= 0) {
+            dx = Math.sqrt(d) / (Math.abs(a) * 2);
+            x1 = xe - dx;
+            x2 = xe + dx;
+            if (Math.abs(x1) <= 1) roots++;
+            if (Math.abs(x2) <= 1) roots++;
+            if (x1 < -1) x1 = x2;
+        }
+
+        if (roots === 1) {
+            if (h0 < 0) rise = i + x1;
+            else set = i + x1;
+
+        } else if (roots === 2) {
+            rise = i + (ye < 0 ? x2 : x1);
+            set = i + (ye < 0 ? x1 : x2);
+        }
+
+        if (rise && set) break;
+
+        h0 = h2;
+    }
+
+    var result = {};
+
+    if (rise) result.rise = hoursLater(t, rise);
+    if (set) result.set = hoursLater(t, set);
+
+    if (!rise && !set) result[ye > 0 ? 'alwaysUp' : 'alwaysDown'] = true;
+
+    return result;
+};
+
+
+// export as Node module / AMD module / browser variable
+// 导出为节点模块/ AMD模块/浏览器变量
+if (typeof exports === 'object' && typeof module !== 'undefined') module.exports = SunCalc;
+else if (typeof define === 'function' && define.amd) define(SunCalc);
+else window.SunCalc = SunCalc;
+
+}());

app/dict/dict_lookup.php

@@ -187,13 +187,13 @@ switch($op){
 
 			}
 			echo "<div class='dict_word'>";
-			echo "<div class='dict'>社区字典</div><a name='net'></a>";
-			$dict_list_a[] = array("net","社区字典");
+			echo "<div class='dict'>{$_local->gui->com_dict}</div><a name='net'></a>";
+			$dict_list_a[] = array("net",$_local->gui->com_dict);
 
 			foreach($userdict as $key => $value){
 				echo "<div class='mean'>{$key}:{$value["mean"]}</div>";
 			}
-			echo "<div><span>贡献者：</span>";
+			echo "<div><span>{$_local->gui->contributor}：</span>";
 			foreach ($userlist as $key => $value) {
 				echo $key."[".$value."]";
 			}
@@ -358,7 +358,8 @@ switch($op){
 		echo "<div id='dictlist'>";
 		foreach($dict_list_a as $x_value) {
 			if(substr($x_value[0],0,4)=="word"){
-				echo "<div style='font-size:120%;font-weight:700;margin-top:15px;'><a href='#{$x_value[0]}'>$x_value[1]</a></div>";
+				echo "<div style='font-size:120%;font-weight:700;margin-top:15px;'>";
+				echo "<a href='#{$x_value[0]}'>$x_value[1]</a></div>";
 			}
 			else{
 				echo "<div><a href='#{$x_value[0]}'>$x_value[1]</a></div>";

app/lang/lang.php

@@ -1,14 +1,14 @@
 	<!--显示模式-->
 	<script>
-		var g_langrage="en";
+		var g_language="en";
 		var g_currLink="";
 		function lang_init(strPage){
 			g_currLink = strPage;
 		}
 		function setLang(strLang){
-			g_langrage=strLang;
-			setCookie('language',g_langrage,365);
-			window.location.assign(location.pathname+"?language="+g_langrage);
+			g_language=strLang;
+			setCookie('language',g_language,365);
+			window.location.assign(location.pathname+"?language="+g_language);
 		}
 	</script>
 	<style>

app/pcdl/classroom.php

@@ -98,11 +98,11 @@ else{
 		}
 
 
-			var g_langrage="en";
+			var g_language="en";
 			function menuLangrage(obj){
-				g_langrage=obj.value;
-				setCookie('language',g_langrage,365);
-				window.location.assign("index_pc.php?language="+g_langrage);
+				g_language=obj.value;
+				setCookie('language',g_language,365);
+				window.location.assign("index_pc.php?language="+g_language);
 			}
 
 	</script>

app/pcdl/html_head.php

@@ -30,7 +30,7 @@ else{
     <link type="text/css" rel="stylesheet" href="../pcdl/css/style_mobile.css" media="screen and (max-width:767px)">
 
 
-    <title>圣典</title>
+    <title>wikipāḷi</title>
 
 	<script src="../public/js/jquery.js"></script>
 	<script src="../public/js/comm.js"></script>

app/pcdl/index1.php

@@ -102,11 +102,11 @@ else{
 		}
 
 
-			var g_langrage="en";
+			var g_language="en";
 			function menuLangrage(obj){
-				g_langrage=obj.value;
-				setCookie('language',g_langrage,365);
-				window.location.assign("index_pc.php?language="+g_langrage);
+				g_language=obj.value;
+				setCookie('language',g_language,365);
+				window.location.assign("index_pc.php?language="+g_language);
 			}
 
 	</script>

app/pcdl/uhome.php

@@ -94,11 +94,11 @@ else{
 			}
 		}
 		
-			var g_langrage="en";
+			var g_language="en";
 			function menuLangrage(obj){
-				g_langrage=obj.value;
-				setCookie('language',g_langrage,365);
-				window.location.assign("index.php?language="+g_langrage);
+				g_language=obj.value;
+				setCookie('language',g_language,365);
+				window.location.assign("index.php?language="+g_language);
 			}
 		function indexInit(){
 			showUserFilaList();

app/public/lang/default.json

@@ -471,6 +471,10 @@
 		"end_of_text": "No Prev",
 		"begin_of_text": "No Next",
 		"chapter_select": "Please choose a chapter in the left sidebar",
+		"kala_pakkha": "kāḷapakkha",
+		"sukka_pakkha": "sukkapakkha",
+		"com_dict": "community dictionary",
+		"contributor": "contributor",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/en.json

@@ -470,6 +470,10 @@
 		"end_of_text": "No Prev",
 		"begin_of_text": "No Next",
 		"chapter_select": "Please choose a chapter in the left sidebar",
+		"kala_pakkha": "waning",
+		"sukka_pakkha": "waxing",
+		"com_dict": "Community Dictionary",
+		"contributor": "contributor",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/my.json

@@ -470,6 +470,10 @@
 		"end_of_text": "No Prev",
 		"begin_of_text": "No Next",
 		"chapter_select": "Please choose a chapter in the left sidebar",
+		"kala_pakkha": "ကာဠပက္ခ",
+		"sukka_pakkha": "သုက္ကပက္ခ",
+		"com_dict": "Community Dictionary",
+		"contributor": "contributor",
 		"": "",
 		"": ""
 	},

app/public/lang/si.json

@@ -475,6 +475,10 @@
 		"end_of_text": "No Prev",
 		"begin_of_text": "No Next",
 		"chapter_select": "Please choose a chapter in the left sidebar",
+		"kala_pakkha": "කාළපක‍්ඛ",
+		"sukka_pakkha": "සුක‍්කපක‍්ඛ",
+		"com_dict": "Community Dictionary",
+		"contributor": "contributor",
 		"": "",
 		"": ""
 	},

app/public/lang/zh-cn.json

@@ -472,8 +472,10 @@
 		"end_of_text": "到底啦",
 		"begin_of_text": "到顶啦",
 		"chapter_select": "请在左侧边栏中选择章节",
-		"kala_pakkha": "渐凹半月",
-		"sukka_pakkha": "渐凸半月",
+		"kala_pakkha": "渐亏半月",
+		"sukka_pakkha": "渐盈半月",
+		"com_dict": "社区字典",
+		"contributor": "贡献者",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/zh-tw.json

@@ -472,6 +472,10 @@
 		"end_of_text": "到底啦",
 		"begin_of_text": "到頂啦",
 		"chapter_select": "請在左側邊欄中選擇章節",
+		"kala_pakkha": "漸虧半月",
+		"sukka_pakkha": "漸盈半月",
+		"com_dict": "社羣字典",
+		"contributor": "貢獻者",
 		"": ""
 	},
 	"grammastr": [

app/studio/buddhist_calendar.php

@@ -153,7 +153,7 @@ $month=$_GET['m']?$_GET['m']:date('m');
 		}
 
 
-			var g_langrage="en";
+			var g_language="en";
 
 var pali_num_str=[
 { "id":"1" , "value":"eka" },
@@ -674,9 +674,9 @@ function set_time_string(date_obj){
 	return(hh+":"+mm+":"+ss)
 }
 function menuLangrage(obj,year,month){
-	g_langrage=obj.value;
-	setCookie('language',g_langrage,365);
-	window.location.assign("buddhist_calendar.php?language="+g_langrage+"&y="+year+"&m="+month);
+	g_language=obj.value;
+	setCookie('language',g_language,365);
+	window.location.assign("buddhist_calendar.php?language="+g_language+"&y="+year+"&m="+month);
 }
 set_uposatha_day();
 set_cur_day_era();

app/studio/filenew.php

@@ -78,11 +78,11 @@ else{$currDevice="computer";}
 			g_is_mobile=false;
 		}
 			
-			var g_langrage="en";
+			var g_language="en";
 			function menuLangrage(obj){
-				g_langrage=obj.value;
-				setCookie('language',g_langrage,365);
-				window.location.assign("filenew.php?language="+g_langrage);
+				g_language=obj.value;
+				setCookie('language',g_language,365);
+				window.location.assign("filenew.php?language="+g_language);
 			}
 
 	</script>

app/studio/index.php

@@ -67,11 +67,11 @@ else{
 			g_is_mobile=false;
 		}
 
-		var g_langrage="en";
+		var g_language="en";
 		function menuLangrage(obj){
-			g_langrage=obj.value;
-			setCookie('language',g_langrage,365);
-			window.location.assign("index.php?language="+g_langrage);
+			g_language=obj.value;
+			setCookie('language',g_language,365);
+			window.location.assign("index.php?language="+g_language);
 		}
 	
 	var gCurrPage="index";

app/studio/index_head.php

@@ -30,11 +30,11 @@ require_once '../public/load_lang.php';
 	<script type="text/javascript">
 	<?php require_once '../public/load_lang_js.php';//加载js语言包?>
 		
-		var g_langrage="en";
+		var g_language="en";
 		function menuLangrage(obj){
-			g_langrage=obj.value;
-			setCookie('language',g_langrage,365);
-			window.location.assign("index.php?language="+g_langrage);
+			g_language=obj.value;
+			setCookie('language',g_language,365);
+			window.location.assign("index.php?language="+g_language);
 		}
 	
 	</script>

app/studio/index_new.php

@@ -58,11 +58,11 @@ else{
 		}
 
 
-			var g_langrage="en";
+			var g_language="en";
 			function menuLangrage(obj){
-				g_langrage=obj.value;
-				setCookie('language',g_langrage,365);
-				window.location.assign("index_new.php?language="+g_langrage);
+				g_language=obj.value;
+				setCookie('language',g_language,365);
+				window.location.assign("index_new.php?language="+g_language);
 			}
 
 	</script>

app/studio/js/common.js

@@ -1,5 +1,5 @@
 var g_is_mobile = false;
-var g_langrage = "langrage_cn";
+var g_language = "langrage_cn";
 
 var gConfigDirMydocument = "../user/My Document/";
 

app/studio/js/vn.js

@@ -1,5 +1,5 @@
 var g_is_mobile=false;
-var g_langrage="langrage_cn";
+var g_language="langrage_cn";
 //输出调试信息
 function debugOutput(str,level){
 str = "<p>"+str+"</p>";

app/studio/recycle.php

@@ -66,11 +66,11 @@ else{
 			g_is_mobile=false;
 		}
 
-		var g_langrage="en";
+		var g_language="en";
 		function menuLangrage(obj){
-			g_langrage=obj.value;
-			setCookie('language',g_langrage,365);
-			window.location.assign("index.php?language="+g_langrage);
+			g_language=obj.value;
+			setCookie('language',g_language,365);
+			window.location.assign("index.php?language="+g_language);
 		}
 
 	var gCurrPage="recycle_bin";

app/studio/search.php

@@ -99,11 +99,11 @@ else{
 		}
 
 
-			var g_langrage="en";
+			var g_language="en";
 			function menuLangrage(obj){
-				g_langrage=obj.value;
-				setCookie('language',g_langrage,365);
-				window.location.assign("search.php?language="+g_langrage);
+				g_language=obj.value;
+				setCookie('language',g_language,365);
+				window.location.assign("search.php?language="+g_language);
 			}
 
 	</script>

app/studio/term_sys_tool.php

@@ -103,11 +103,11 @@ else{
 		}
 
 
-			var g_langrage="en";
+			var g_language="en";
 			function menuLangrage(obj){
-				g_langrage=obj.value;
-				setCookie('language',g_langrage,365);
-				window.location.assign("search.php?language="+g_langrage);
+				g_language=obj.value;
+				setCookie('language',g_language,365);
+				window.location.assign("search.php?language="+g_language);
 			}
 var g_selected_array=new Array();
 var g_unselected_array=new Array();

app/tools/tree_designer.php

@@ -96,11 +96,11 @@ else{
 		}
 
 
-			var g_langrage="en";
+			var g_language="en";
 			function menuLangrage(obj){
-				g_langrage=obj.value;
-				setCookie('language',g_langrage,365);
-				window.location.assign("search.php?language="+g_langrage);
+				g_language=obj.value;
+				setCookie('language',g_language,365);
+				window.location.assign("search.php?language="+g_language);
 			}
 function treedesign(){
 	var tree_word=tree_head_input.value;

app/ucenter/user.php

@@ -1,6 +1,6 @@
 	<!--显示模式-->
 	<script>
-		var g_langrage="en";
+		var g_language="en";
 		var g_currLink="";
 		function user_init(strPage){
 			g_currLink = strPage;