Browse Source

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

缅文转码修复+多语言
Bhikkhu China Kosalla 4 years ago
parent
commit
ea9a25acf4
67 changed files with 1387 additions and 185 deletions
  1. 13 0
      material-ui/.gitignore
  2. 13 0
      material-ui/README.md
  3. 77 0
      material-ui/package.json
  4. BIN
      material-ui/public/favicon.ico
  5. 43 0
      material-ui/public/index.html
  6. BIN
      material-ui/public/logo192.png
  7. BIN
      material-ui/public/logo512.png
  8. 25 0
      material-ui/public/manifest.json
  9. 3 0
      material-ui/public/robots.txt
  10. 10 0
      material-ui/src/404.tsx
  11. 22 0
      material-ui/src/components/form.tsx
  12. 5 0
      material-ui/src/hooks.ts
  13. 4 0
      material-ui/src/index.css
  14. 51 0
      material-ui/src/index.tsx
  15. 65 0
      material-ui/src/layouts/Copyright.tsx
  16. 40 0
      material-ui/src/layouts/application/index.tsx
  17. 5 0
      material-ui/src/layouts/dashboard/index.tsx
  18. 28 0
      material-ui/src/locales/en-US.ts
  19. 30 0
      material-ui/src/locales/index.ts
  20. 5 0
      material-ui/src/locales/zh-Hans.ts
  21. 5 0
      material-ui/src/locales/zh-Hant.ts
  22. 2 0
      material-ui/src/logo.svg
  23. 32 0
      material-ui/src/plugins/demo/index.tsx
  24. 6 0
      material-ui/src/plugins/demo/posts/edit.tsx
  25. 6 0
      material-ui/src/plugins/demo/posts/index.tsx
  26. 6 0
      material-ui/src/plugins/demo/posts/new.tsx
  27. 6 0
      material-ui/src/plugins/demo/topics/edit.tsx
  28. 6 0
      material-ui/src/plugins/demo/topics/index.tsx
  29. 6 0
      material-ui/src/plugins/demo/topics/new.tsx
  30. 16 0
      material-ui/src/plugins/index.tsx
  31. 25 0
      material-ui/src/plugins/nut/home.tsx
  32. 36 0
      material-ui/src/plugins/nut/index.tsx
  33. 130 0
      material-ui/src/plugins/nut/install.tsx
  34. 103 0
      material-ui/src/plugins/nut/users/NonSignInLayout.tsx
  35. 33 0
      material-ui/src/plugins/nut/users/confirm.tsx
  36. 33 0
      material-ui/src/plugins/nut/users/forgot-password.tsx
  37. 6 0
      material-ui/src/plugins/nut/users/logs.tsx
  38. 6 0
      material-ui/src/plugins/nut/users/reset-password.tsx
  39. 43 0
      material-ui/src/plugins/nut/users/sign-in.tsx
  40. 70 0
      material-ui/src/plugins/nut/users/sign-up.tsx
  41. 33 0
      material-ui/src/plugins/nut/users/unlock.tsx
  42. 6 0
      material-ui/src/plugins/nut/users/update-profile.tsx
  43. 1 0
      material-ui/src/react-app-env.d.ts
  44. 40 0
      material-ui/src/reducers/current-user.ts
  45. 35 0
      material-ui/src/reducers/site-info.ts
  46. 15 0
      material-ui/src/reportWebVitals.ts
  47. 1 0
      material-ui/src/request.ts
  48. 5 0
      material-ui/src/setupTests.ts
  49. 17 0
      material-ui/src/store.ts
  50. 26 0
      material-ui/tsconfig.json
  51. 1 1
      public/app/channal/channal.js
  52. 1 1
      public/app/pcdl/head_bar.php
  53. 2 2
      public/app/public/book_index/a/default.json
  54. 2 2
      public/app/public/book_index/a/en.json
  55. 2 2
      public/app/public/book_index/a/my.json
  56. 3 3
      public/app/public/book_index/a/zh-cn.json
  57. 2 2
      public/app/public/book_index/a/zh-tw.json
  58. 14 23
      public/app/public/charcode/coverter_my.js
  59. 4 3
      public/app/public/charcode/myanmar.js
  60. 1 0
      public/app/public/lang/default.json
  61. 1 0
      public/app/public/lang/en.json
  62. 125 144
      public/app/public/lang/my.json
  63. 1 0
      public/app/public/lang/si.json
  64. 1 0
      public/app/public/lang/zh-cn.json
  65. 1 0
      public/app/public/lang/zh-tw.json
  66. 29 2
      public/app/studio/js/relation_list.js
  67. 3 0
      public/app/users_guide/zh-cn/grammar_my_abs.md

+ 13 - 0
material-ui/.gitignore

@@ -0,0 +1,13 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules/
+/yarn.lock
+
+# testing
+
+# production
+/build/
+
+# misc
+/.env.*.local

+ 13 - 0
material-ui/README.md

@@ -0,0 +1,13 @@
+# Dashboard
+
+## Install dependencies
+
+```bash
+yarn install
+```
+
+### `yarn start`
+
+Runs the app in the development mode. Open [http://localhost:3000/my/](http://localhost:3000/my/) to view it in the browser.
+
+The page will reload if you make edits. You will also see any lint errors in the console.

+ 77 - 0
material-ui/package.json

@@ -0,0 +1,77 @@
+{
+    "name": "iapt",
+    "version": "0.1.0",
+    "private": true,
+    "homepage": "/my/",
+    "dependencies": {
+        "@emotion/react": "^11.8.2",
+        "@emotion/styled": "^11.8.1",
+        "@fontsource/roboto": "^4.5.3",
+        "@loadable/component": "^5.15.2",
+        "@mui/icons-material": "^5.5.0",
+        "@mui/material": "^5.5.0",
+        "@reduxjs/toolkit": "^1.8.0",
+        "@testing-library/jest-dom": "^5.14.1",
+        "@testing-library/react": "^12.0.0",
+        "@testing-library/user-event": "^13.2.1",
+        "@types/jest": "^27.0.1",
+        "@types/loadable__component": "^5.13.4",
+        "@types/node": "^16.7.13",
+        "@types/react": "^17.0.20",
+        "@types/react-dom": "^17.0.9",
+        "@types/react-redux": "^7.1.23",
+        "dinero.js": "^2.0.0-alpha.8",
+        "emoji-mart": "^3.0.1",
+        "google-map-react": "^2.1.10",
+        "js-cookie": "^3.0.1",
+        "jwt-decode": "^3.1.2",
+        "material-design-icons": "^3.0.1",
+        "moment": "^2.29.1",
+        "moment-timezone": "^0.5.34",
+        "qrcode.react": "^2.0.0",
+        "react": "^17.0.2",
+        "react-color": "^2.19.3",
+        "react-copy-to-clipboard": "^5.0.4",
+        "react-dom": "^17.0.2",
+        "react-dropzone": "^12.0.4",
+        "react-helmet-async": "^1.2.3",
+        "react-highlight-words": "^0.17.0",
+        "react-hook-form": "^7.27.1",
+        "react-intl": "^5.24.6",
+        "react-json-view": "^1.21.3",
+        "react-markdown": "^8.0.0",
+        "react-quill": "^2.0.0-beta.4",
+        "react-redux": "^7.2.6",
+        "react-router-dom": "6",
+        "react-scripts": "5.0.0",
+        "react-sparklines": "^1.7.0",
+        "react-syntax-highlighter": "^15.4.5",
+        "typescript": "^4.4.2",
+        "video.js": "^7.17.0",
+        "web-vitals": "^2.1.0"
+    },
+    "scripts": {
+        "start": "react-scripts start",
+        "build": "react-scripts build",
+        "test": "react-scripts test",
+        "eject": "react-scripts eject"
+    },
+    "eslintConfig": {
+        "extends": [
+            "react-app",
+            "react-app/jest"
+        ]
+    },
+    "browserslist": {
+        "production": [
+            ">0.2%",
+            "not dead",
+            "not op_mini all"
+        ],
+        "development": [
+            "last 1 chrome version",
+            "last 1 firefox version",
+            "last 1 safari version"
+        ]
+    }
+}

BIN
material-ui/public/favicon.ico


+ 43 - 0
material-ui/public/index.html

@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta
+      name="description"
+      content="Web site created using create-react-app"
+    />
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <!--
+      manifest.json provides metadata used when your web app is installed on a
+      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <!--
+      Notice the use of %PUBLIC_URL% in the tags above.
+      It will be replaced with the URL of the `public` folder during the build.
+      Only files inside the `public` folder can be referenced from the HTML.
+
+      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      work correctly both with client-side routing and a non-root public URL.
+      Learn how to configure a non-root public URL by running `npm run build`.
+    -->
+    <title>React App</title>
+  </head>
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+    <!--
+      This HTML file is a template.
+      If you open it directly in the browser, you will see an empty page.
+
+      You can add webfonts, meta tags, or analytics to this file.
+      The build step will place the bundled scripts into the <body> tag.
+
+      To begin the development, run `npm start` or `yarn start`.
+      To create a production bundle, use `npm run build` or `yarn build`.
+    -->
+  </body>
+</html>

BIN
material-ui/public/logo192.png


BIN
material-ui/public/logo512.png


+ 25 - 0
material-ui/public/manifest.json

@@ -0,0 +1,25 @@
+{
+  "short_name": "React App",
+  "name": "Create React App Sample",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    },
+    {
+      "src": "logo192.png",
+      "type": "image/png",
+      "sizes": "192x192"
+    },
+    {
+      "src": "logo512.png",
+      "type": "image/png",
+      "sizes": "512x512"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}

+ 3 - 0
material-ui/public/robots.txt

@@ -0,0 +1,3 @@
+# https://www.robotstxt.org/robotstxt.html
+User-agent: *
+Disallow:

+ 10 - 0
material-ui/src/404.tsx

@@ -0,0 +1,10 @@
+import { useIntl } from "react-intl";
+
+import Layout from "./layouts/application";
+
+function Widget() {
+  const intl = useIntl();
+  return <Layout title={intl.formatMessage({ id: "404.title" })}>aaa</Layout>;
+}
+
+export default Widget;

+ 22 - 0
material-ui/src/components/form.tsx

@@ -0,0 +1,22 @@
+export const REAL_NAME_VALIDATOR = {
+  required: true,
+  minLength: 2,
+  maxLength: 32,
+};
+export const NICK_NAME_VALIDATOR = {
+  required: true,
+  minLength: 2,
+  maxLength: 32,
+  pattern: /[\\.\w-]{6,32}/,
+};
+export const EMAIL_VALIDATOR = {
+  required: true,
+  minLength: 6,
+  maxLength: 255,
+  pattern: /^[\\.a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/,
+};
+export const PASSWORD_VALIDATOR = {
+  required: true,
+  minLength: 6,
+  maxLength: 64,
+};

+ 5 - 0
material-ui/src/hooks.ts

@@ -0,0 +1,5 @@
+import { TypedUseSelectorHook, useDispatch, useSelector } from "react-redux";
+import type { RootState, AppDispatch } from "./store";
+
+export const useAppDispatch = () => useDispatch<AppDispatch>();
+export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;

+ 4 - 0
material-ui/src/index.css

@@ -0,0 +1,4 @@
+body {
+  margin: 0;
+  padding: 0;
+}

+ 51 - 0
material-ui/src/index.tsx

@@ -0,0 +1,51 @@
+import "@fontsource/roboto/300.css";
+import "@fontsource/roboto/400.css";
+import "@fontsource/roboto/500.css";
+import "@fontsource/roboto/700.css";
+import "material-design-icons/iconfont/material-icons.css";
+import "react-quill/dist/quill.snow.css";
+
+import "./index.css";
+
+import React from "react";
+import ReactDOM from "react-dom";
+import { IntlProvider } from "react-intl";
+import { BrowserRouter, Route, Routes } from "react-router-dom";
+import { Provider } from "react-redux";
+import CachedOutlinedIcon from "@mui/icons-material/CachedOutlined";
+import loadable from "@loadable/component";
+
+import plugins from "./plugins";
+import { get as getLocale, messages as getMessages } from "./locales";
+import NotFound from "./404";
+import reportWebVitals from "./reportWebVitals";
+import store from "./store";
+
+const lang = getLocale();
+const messages = getMessages(lang);
+
+ReactDOM.render(
+  <React.StrictMode>
+    <Provider store={store}>
+      <IntlProvider messages={messages} locale={lang}>
+        <BrowserRouter basename="/my/">
+          <Routes>
+            {plugins.routes.map((it) => {
+              const W = loadable(it.component, {
+                fallback: <CachedOutlinedIcon />,
+              });
+              return <Route key={it.path} path={it.path} element={<W />} />;
+            })}
+            <Route path="*" element={<NotFound />} />
+          </Routes>
+        </BrowserRouter>
+      </IntlProvider>
+    </Provider>
+  </React.StrictMode>,
+  document.getElementById("root")
+);
+
+// If you want to start measuring performance in your app, pass a function
+// to log results (for example: reportWebVitals(console.log))
+// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
+reportWebVitals();

+ 65 - 0
material-ui/src/layouts/Copyright.tsx

@@ -0,0 +1,65 @@
+import Typography from "@mui/material/Typography";
+import Link from "@mui/material/Link";
+import GitHubIcon from "@mui/icons-material/GitHub";
+import HomeIcon from "@mui/icons-material/Home";
+import { FormattedMessage } from "react-intl";
+import Stack from "@mui/material/Stack";
+import { Helmet } from "react-helmet-async";
+
+import { refresh, selectSiteInfo } from "../reducers/site-info";
+import { useAppSelector, useAppDispatch } from "../hooks";
+import { set as setLocale } from "../locales";
+
+interface IProps {
+    title: string;
+}
+
+const Widget = (props: IProps) => {
+    const site = useAppSelector(selectSiteInfo);
+    const dispatch = useAppDispatch();
+    if (site.languages.length === 0) {
+        dispatch(
+            refresh({
+                title: "demo",
+                subhead: "test",
+                copyright: `${new Date().getFullYear()}`,
+                languages: ["en-US"],
+            })
+        );
+    }
+    return (
+        <Stack spacing={2} direction="row">
+            <Helmet>
+                <title>
+                    {props.title} | {site.title}
+                </title>
+            </Helmet>
+            <Typography variant="body2" color="text.secondary" align="center">
+                ©{site.copyright}
+            </Typography>
+            <Link
+                color="inherit"
+                target="_blank"
+                href="https://github.com/iapt-platform/mint"
+            >
+                <GitHubIcon />
+            </Link>
+            <Link color="inherit" target="_blank" href="/">
+                <HomeIcon />
+            </Link>
+            {site.languages.map((it) => (
+                <Link
+                    onClick={() => {
+                        setLocale(it);
+                        window.location.reload();
+                    }}
+                    key={it}
+                >
+                    <FormattedMessage id={`languages.${it}`} />
+                </Link>
+            ))}
+        </Stack>
+    );
+};
+
+export default Widget;

+ 40 - 0
material-ui/src/layouts/application/index.tsx

@@ -0,0 +1,40 @@
+import { ReactNode } from "react";
+import CssBaseline from "@mui/material/CssBaseline";
+import Box from "@mui/material/Box";
+import Container from "@mui/material/Container";
+import { createTheme, ThemeProvider } from "@mui/material/styles";
+import { HelmetProvider } from "react-helmet-async";
+
+import Copyright from "../Copyright";
+
+const theme = createTheme();
+
+interface IProps {
+  title: string;
+  children: ReactNode;
+}
+
+function Widget({ title, children }: IProps) {
+  return (
+    <HelmetProvider>
+      <ThemeProvider theme={theme}>
+        <Container component="main" maxWidth="xs">
+          <CssBaseline />
+          <Box
+            sx={{
+              marginTop: 8,
+              display: "flex",
+              flexDirection: "column",
+              alignItems: "center",
+            }}
+          >
+            {children}
+          </Box>
+          <Copyright title={title} />
+        </Container>
+      </ThemeProvider>
+    </HelmetProvider>
+  );
+}
+
+export default Widget;

+ 5 - 0
material-ui/src/layouts/dashboard/index.tsx

@@ -0,0 +1,5 @@
+function Widget() {
+  return <div>dashboard layout</div>;
+}
+
+export default Widget;

+ 28 - 0
material-ui/src/locales/en-US.ts

@@ -0,0 +1,28 @@
+const items = {
+  "buttons.search": "Search",
+  "buttons.submit": "Submit",
+
+  "fields.email": "Email address",
+  "fields.real-name": "Real name",
+  "fields.nick-name": "Nick name",
+  "fields.password": "Password",
+  "fields.password-confirmation": "Password confirmation",
+  "fields.body": "Body",
+
+  "helpers.real-name": "Real-name's length should between 2~32",
+  "helpers.email": "Please entry a valid email address",
+  "helpers.password": "Password's length should between 6~64",
+  "helpers.password-confirmation": "Passwords not match",
+
+  "404.title": "Not found",
+
+  "nut.install.title": "Install",
+  "nut.users.sign-in.title": "Sign in",
+  "nut.users.sign-up.title": "Sign Up",
+  "nut.users.confirm.title": "Resend confirmation instructions",
+  "nut.users.unlock.title": "Resend unlock instructions",
+  "nut.users.forgot-password.title": "Forgot your password?",
+  "nut.leave-words.new.title": "Leave us a message",
+};
+
+export default items;

+ 30 - 0
material-ui/src/locales/index.ts

@@ -0,0 +1,30 @@
+import enUS from "./en-US";
+import zhHans from "./zh-Hans";
+import zhHant from "./zh-Hant";
+
+const KEY = "locale";
+
+export const get = (): string => {
+  return localStorage.getItem(KEY) || "en-US";
+};
+
+export const set = (lang: string) => {
+  localStorage.setItem(KEY, lang);
+};
+
+const languages = {
+  "languages.en-US": "English",
+  "languages.zh-Hans": "简体中文",
+  "languages.zh-Hant": "繁體中文",
+};
+
+export const messages = (lang: string): any => {
+  switch (lang) {
+    case "zh-Hans":
+      return { ...languages, ...zhHans };
+    case "zh-Hant":
+      return { ...languages, ...zhHant };
+    default:
+      return { ...languages, ...enUS };
+  }
+};

+ 5 - 0
material-ui/src/locales/zh-Hans.ts

@@ -0,0 +1,5 @@
+const items = {
+  "buttons.search": "搜索",
+};
+
+export default items;

+ 5 - 0
material-ui/src/locales/zh-Hant.ts

@@ -0,0 +1,5 @@
+const items = {
+  "buttons.search": "檢索",
+};
+
+export default items;

File diff suppressed because it is too large
+ 2 - 0
material-ui/src/logo.svg


+ 32 - 0
material-ui/src/plugins/demo/index.tsx

@@ -0,0 +1,32 @@
+import { IPlugin } from "..";
+
+export const plugin: IPlugin = {
+    routes: [
+        {
+            path: "/demo/topics/new",
+            component: () => import("./topics/new"),
+        },
+        {
+            path: "/demo/topics/edit",
+            component: () => import("./topics/edit"),
+        },
+        {
+            path: "/demo/topics",
+            component: () => import("./topics/index"),
+        },
+        {
+            path: "/demo/posts/new",
+            component: () => import("./posts/new"),
+        },
+        {
+            path: "/demo/posts/edit",
+            component: () => import("./posts/edit"),
+        },
+        {
+            path: "/demo/posts",
+            component: () => import("./posts/index"),
+        },
+    ],
+};
+
+export default plugin;

+ 6 - 0
material-ui/src/plugins/demo/posts/edit.tsx

@@ -0,0 +1,6 @@
+function Widget() {
+    // TODO
+    return <div>demo posts edit</div>;
+}
+
+export default Widget;

+ 6 - 0
material-ui/src/plugins/demo/posts/index.tsx

@@ -0,0 +1,6 @@
+function Widget() {
+    // TODO
+    return <div>demo posts index </div>;
+}
+
+export default Widget;

+ 6 - 0
material-ui/src/plugins/demo/posts/new.tsx

@@ -0,0 +1,6 @@
+function Widget() {
+    // TODO
+    return <div>demo posts new</div>;
+}
+
+export default Widget;

+ 6 - 0
material-ui/src/plugins/demo/topics/edit.tsx

@@ -0,0 +1,6 @@
+function Widget() {
+    // TODO
+    return <div>demo topics edit</div>;
+}
+
+export default Widget;

+ 6 - 0
material-ui/src/plugins/demo/topics/index.tsx

@@ -0,0 +1,6 @@
+function Widget() {
+    // TODO
+    return <div>demo topics index</div>;
+}
+
+export default Widget;

+ 6 - 0
material-ui/src/plugins/demo/topics/new.tsx

@@ -0,0 +1,6 @@
+function Widget() {
+    // TODO
+    return <div>demo topics new</div>;
+}
+
+export default Widget;

+ 16 - 0
material-ui/src/plugins/index.tsx

@@ -0,0 +1,16 @@
+import nut from "./nut";
+import demo from "./demo";
+
+export interface IRoute {
+    path: string;
+    component: any;
+}
+
+export interface IPlugin {
+    routes: IRoute[];
+}
+
+const plugin: IPlugin = {
+    routes: [...demo.routes, ...nut.routes],
+};
+export default plugin;

+ 25 - 0
material-ui/src/plugins/nut/home.tsx

@@ -0,0 +1,25 @@
+import { FormattedMessage } from "react-intl";
+import { Link } from "react-router-dom";
+
+function Widget() {
+  // TODO
+  return (
+    <div>
+      home of <FormattedMessage id="languages.zh-Hant" />
+      <ol>
+        <li>
+          <Link to="/users/sign-in">Sign In</Link>
+        </li>
+        <li>
+          <Link to="/users/sign-up">Sign up</Link>
+        </li>
+        <li>
+          <Link to="/install">install</Link>
+        </li>
+        <li></li>
+      </ol>
+    </div>
+  );
+}
+
+export default Widget;

+ 36 - 0
material-ui/src/plugins/nut/index.tsx

@@ -0,0 +1,36 @@
+import { IPlugin } from "..";
+
+const plugin: IPlugin = {
+    routes: [
+        {
+            path: "/users/forgot-password",
+            component: () => import("./users/forgot-password"),
+        },
+        {
+            path: "/users/unlock",
+            component: () => import("./users/unlock"),
+        },
+        {
+            path: "/users/confirm",
+            component: () => import("./users/confirm"),
+        },
+        {
+            path: "/users/sign-in",
+            component: () => import("./users/sign-in"),
+        },
+        {
+            path: "/users/sign-up",
+            component: () => import("./users/sign-up"),
+        },
+        {
+            path: "/install",
+            component: () => import("./install"),
+        },
+        {
+            path: "/",
+            component: () => import("./home"),
+        },
+    ],
+};
+
+export default plugin;

+ 130 - 0
material-ui/src/plugins/nut/install.tsx

@@ -0,0 +1,130 @@
+import TextField from "@mui/material/TextField";
+import Grid from "@mui/material/Grid";
+import LockOutlinedIcon from "@mui/icons-material/LockOutlined";
+import { useForm, Controller, SubmitHandler } from "react-hook-form";
+import { useIntl } from "react-intl";
+
+import Layout from "./users/NonSignInLayout";
+import {
+  REAL_NAME_VALIDATOR,
+  EMAIL_VALIDATOR,
+  PASSWORD_VALIDATOR,
+} from "../../components/form";
+
+interface IFormData {
+  realName: string;
+  email: string;
+  password: string;
+  passwordConfirmation: string;
+}
+
+const Widget = () => {
+  const intl = useIntl();
+  const {
+    control,
+    formState: { errors },
+    handleSubmit,
+  } = useForm<IFormData>({
+    defaultValues: {
+      realName: "",
+      email: "",
+      password: "",
+      passwordConfirmation: "",
+    },
+  });
+  const onSubmit: SubmitHandler<IFormData> = (data) => {
+    // TODO
+    console.log(data);
+  };
+  return (
+    <Layout
+      logo={<LockOutlinedIcon />}
+      title={intl.formatMessage({ id: "nut.install.title" })}
+      handleSubmit={handleSubmit(onSubmit)}
+    >
+      <Grid item xs={12}>
+        <Controller
+          name="realName"
+          control={control}
+          rules={REAL_NAME_VALIDATOR}
+          render={({ field }) => (
+            <TextField
+              required
+              fullWidth
+              label={intl.formatMessage({ id: "fields.real-name" })}
+              error={errors.realName !== undefined}
+              helperText={
+                errors.realName &&
+                intl.formatMessage({ id: "helpers.real-name" })
+              }
+              {...field}
+            />
+          )}
+        />
+      </Grid>
+      <Grid item xs={12}>
+        <Controller
+          name="email"
+          rules={EMAIL_VALIDATOR}
+          control={control}
+          render={({ field }) => (
+            <TextField
+              required
+              fullWidth
+              label={intl.formatMessage({ id: "fields.email" })}
+              type="email"
+              error={errors.email !== undefined}
+              helperText={
+                errors.email && intl.formatMessage({ id: "helpers.email" })
+              }
+              {...field}
+            />
+          )}
+        />
+      </Grid>
+      <Grid item xs={12}>
+        <Controller
+          name="password"
+          rules={PASSWORD_VALIDATOR}
+          control={control}
+          render={({ field }) => (
+            <TextField
+              required
+              fullWidth
+              label={intl.formatMessage({ id: "fields.password" })}
+              type="password"
+              error={errors.password !== undefined}
+              helperText={
+                errors.password &&
+                intl.formatMessage({ id: "helpers.password" })
+              }
+              {...field}
+            />
+          )}
+        />
+      </Grid>
+      <Grid item xs={12}>
+        <Controller
+          name="passwordConfirmation"
+          control={control}
+          render={({ field }) => (
+            <TextField
+              required
+              fullWidth
+              label={intl.formatMessage({ id: "fields.password-confirmation" })}
+              type="password"
+              error={errors.passwordConfirmation !== undefined}
+              helperText={
+                errors.passwordConfirmation &&
+                intl.formatMessage({ id: "helpers.password-confirmation" })
+              }
+              {...field}
+            />
+          )}
+        />
+      </Grid>
+    </Layout>
+  );
+};
+
+export default Widget;

+ 103 - 0
material-ui/src/plugins/nut/users/NonSignInLayout.tsx

@@ -0,0 +1,103 @@
+import { ReactNode } from "react";
+import Button from "@mui/material/Button";
+import Grid from "@mui/material/Grid";
+import Box from "@mui/material/Box";
+import Avatar from "@mui/material/Avatar";
+import Typography from "@mui/material/Typography";
+import LockOutlinedIcon from "@mui/icons-material/LockOutlined";
+import PersonPinOutlinedIcon from "@mui/icons-material/PersonPinOutlined";
+import PersonAddAltOutlinedIcon from "@mui/icons-material/PersonAddAltOutlined";
+import ConfirmationNumberOutlinedIcon from "@mui/icons-material/ConfirmationNumberOutlined";
+import PasswordOutlinedIcon from "@mui/icons-material/PasswordOutlined";
+import ListItemIcon from "@mui/material/ListItemIcon";
+import ListItemText from "@mui/material/ListItemText";
+import List from "@mui/material/List";
+import ListItem from "@mui/material/ListItem";
+import ListItemButton from "@mui/material/ListItemButton";
+import { useNavigate } from "react-router-dom";
+import { FormattedMessage } from "react-intl";
+
+import Layout from "../../../layouts/application";
+
+const shared_links = [
+    {
+        to: "/users/sign-in",
+        label: "nut.users.sign-in.title",
+        icon: <PersonPinOutlinedIcon />,
+    },
+    {
+        to: "/users/sign-up",
+        label: "nut.users.sign-up.title",
+        icon: <PersonAddAltOutlinedIcon />,
+    },
+    {
+        to: "/users/confirm",
+        label: "nut.users.confirm.title",
+        icon: <ConfirmationNumberOutlinedIcon />,
+    },
+    {
+        to: "/users/unlock",
+        label: "nut.users.unlock.title",
+        icon: <LockOutlinedIcon />,
+    },
+    {
+        to: "/users/forgot-password",
+        label: "nut.users.forgot-password.title",
+        icon: <PasswordOutlinedIcon />,
+    },
+];
+interface IProps {
+    title: string;
+    children: ReactNode;
+    logo: ReactNode;
+    handleSubmit: (event: React.FormEvent<HTMLFormElement>) => void;
+}
+
+function Widget({ title, logo, children, handleSubmit }: IProps) {
+    // const onSubmit = (event: React.FormEvent<HTMLFormElement>) => {
+    //   event.preventDefault();
+    //   const data = new FormData(event.currentTarget);
+    //   handleSubmit(data);
+    // };
+    const navigate = useNavigate();
+    return (
+        <Layout title={title}>
+            <Avatar sx={{ bgcolor: "secondary.main" }}>{logo}</Avatar>
+            <Typography component="h1" variant="h5">
+                {title}
+            </Typography>
+            <Box component="form" noValidate onSubmit={handleSubmit}>
+                <Grid container spacing={2}>
+                    {children}
+                    <Grid item>
+                        <Button type="submit" fullWidth variant="contained">
+                            <FormattedMessage id="buttons.submit" />
+                        </Button>
+                    </Grid>
+                    <Grid item>
+                        <List>
+                            {shared_links.map((it) => (
+                                <ListItem key={it.to} disablePadding>
+                                    <ListItemButton
+                                        onClick={() => navigate(it.to)}
+                                    >
+                                        <ListItemIcon>{it.icon}</ListItemIcon>
+                                        <ListItemText
+                                            primary={
+                                                <FormattedMessage
+                                                    id={it.label}
+                                                />
+                                            }
+                                        />
+                                    </ListItemButton>
+                                </ListItem>
+                            ))}
+                        </List>
+                    </Grid>
+                </Grid>
+            </Box>
+        </Layout>
+    );
+}
+
+export default Widget;

+ 33 - 0
material-ui/src/plugins/nut/users/confirm.tsx

@@ -0,0 +1,33 @@
+import TextField from "@mui/material/TextField";
+import Grid from "@mui/material/Grid";
+import LockOutlinedIcon from "@mui/icons-material/LockOutlined";
+
+import Layout from "./NonSignInLayout";
+import { useIntl } from "react-intl";
+
+const Widget = () => {
+  const handleSubmit = () => {
+    // TODO
+    // console.log(data.get("email"));
+  };
+  const intl = useIntl();
+  return (
+    <Layout
+      logo={<LockOutlinedIcon />}
+      title={intl.formatMessage({ id: "nut.users.confirm.title" })}
+      handleSubmit={handleSubmit}
+    >
+      <Grid item xs={12}>
+        <TextField
+          required
+          fullWidth
+          id="email"
+          label={intl.formatMessage({ id: "fields.email" })}
+          name="email"
+        />
+      </Grid>
+    </Layout>
+  );
+};
+
+export default Widget;

+ 33 - 0
material-ui/src/plugins/nut/users/forgot-password.tsx

@@ -0,0 +1,33 @@
+import TextField from "@mui/material/TextField";
+import Grid from "@mui/material/Grid";
+import LockOutlinedIcon from "@mui/icons-material/LockOutlined";
+
+import Layout from "./NonSignInLayout";
+import { useIntl } from "react-intl";
+
+const Widget = () => {
+  const handleSubmit = () => {
+    // TODO
+    // console.log(data.get("email"));
+  };
+  const intl = useIntl();
+  return (
+    <Layout
+      logo={<LockOutlinedIcon />}
+      title={intl.formatMessage({ id: "nut.users.forgot-password.title" })}
+      handleSubmit={handleSubmit}
+    >
+      <Grid item xs={12}>
+        <TextField
+          required
+          fullWidth
+          id="email"
+          label={intl.formatMessage({ id: "fields.email" })}
+          name="email"
+        />
+      </Grid>
+    </Layout>
+  );
+};
+
+export default Widget;

+ 6 - 0
material-ui/src/plugins/nut/users/logs.tsx

@@ -0,0 +1,6 @@
+function Widget() {
+  // TODO
+  return <div>logs</div>;
+}
+
+export default Widget;

+ 6 - 0
material-ui/src/plugins/nut/users/reset-password.tsx

@@ -0,0 +1,6 @@
+function Widget() {
+  // TODO
+  return <div>reset password</div>;
+}
+
+export default Widget;

+ 43 - 0
material-ui/src/plugins/nut/users/sign-in.tsx

@@ -0,0 +1,43 @@
+import TextField from "@mui/material/TextField";
+import Grid from "@mui/material/Grid";
+import LockOutlinedIcon from "@mui/icons-material/LockOutlined";
+
+import Layout from "./NonSignInLayout";
+import { useIntl } from "react-intl";
+
+const Widget = () => {
+  const handleSubmit = () => {
+    // TODO
+    // console.log(data.get("email"));
+  };
+  const intl = useIntl();
+  return (
+    <Layout
+      logo={<LockOutlinedIcon />}
+      title={intl.formatMessage({ id: "nut.users.sign-in.title" })}
+      handleSubmit={handleSubmit}
+    >
+      <Grid item xs={12}>
+        <TextField
+          required
+          fullWidth
+          id="email"
+          label={intl.formatMessage({ id: "fields.email" })}
+          name="email"
+        />
+      </Grid>
+      <Grid item xs={12}>
+        <TextField
+          required
+          fullWidth
+          name="password"
+          label={intl.formatMessage({ id: "fields.password" })}
+          type="password"
+          id="password"
+        />
+      </Grid>
+    </Layout>
+  );
+};
+
+export default Widget;

+ 70 - 0
material-ui/src/plugins/nut/users/sign-up.tsx

@@ -0,0 +1,70 @@
+import TextField from "@mui/material/TextField";
+import FormControlLabel from "@mui/material/FormControlLabel";
+import Checkbox from "@mui/material/Checkbox";
+import Grid from "@mui/material/Grid";
+import LockOutlinedIcon from "@mui/icons-material/LockOutlined";
+import { useIntl } from "react-intl";
+
+import Layout from "./NonSignInLayout";
+
+const Widget = () => {
+  const handleSubmit = () => {
+    // TODO
+    // console.log(data.get("email"));
+  };
+  const intl = useIntl();
+  return (
+    <Layout
+      logo={<LockOutlinedIcon />}
+      title={intl.formatMessage({ id: "nut.users.sign-up.title" })}
+      handleSubmit={handleSubmit}
+    >
+      <Grid item xs={12}>
+        <TextField
+          required
+          fullWidth
+          id="realName"
+          label={intl.formatMessage({ id: "fields.real-name" })}
+          name="lastName"
+        />
+      </Grid>
+      <Grid item xs={12}>
+        <TextField
+          required
+          fullWidth
+          id="email"
+          label={intl.formatMessage({ id: "fields.email" })}
+          name="email"
+        />
+      </Grid>
+      <Grid item xs={12}>
+        <TextField
+          required
+          fullWidth
+          name="password"
+          label={intl.formatMessage({ id: "fields.password" })}
+          type="password"
+          id="password"
+        />
+      </Grid>
+      <Grid item xs={12}>
+        <TextField
+          required
+          fullWidth
+          name="passwordConfirmation"
+          label={intl.formatMessage({ id: "fields.password-confirmation" })}
+          type="password"
+          id="passwordConfirmation"
+        />
+      </Grid>
+      <Grid item xs={12}>
+        <FormControlLabel
+          control={<Checkbox value="allowExtraEmails" color="primary" />}
+          label="I want to receive inspiration, marketing promotions and updates via email."
+        />
+      </Grid>
+    </Layout>
+  );
+};
+
+export default Widget;

+ 33 - 0
material-ui/src/plugins/nut/users/unlock.tsx

@@ -0,0 +1,33 @@
+import TextField from "@mui/material/TextField";
+import Grid from "@mui/material/Grid";
+import LockOutlinedIcon from "@mui/icons-material/LockOutlined";
+
+import Layout from "./NonSignInLayout";
+import { useIntl } from "react-intl";
+
+const Widget = () => {
+  const handleSubmit = () => {
+    // TODO
+    // console.log(data.get("email"));
+  };
+  const intl = useIntl();
+  return (
+    <Layout
+      logo={<LockOutlinedIcon />}
+      title={intl.formatMessage({ id: "nut.users.unlock.title" })}
+      handleSubmit={handleSubmit}
+    >
+      <Grid item xs={12}>
+        <TextField
+          required
+          fullWidth
+          id="email"
+          label={intl.formatMessage({ id: "fields.email" })}
+          name="email"
+        />
+      </Grid>
+    </Layout>
+  );
+};
+
+export default Widget;

+ 6 - 0
material-ui/src/plugins/nut/users/update-profile.tsx

@@ -0,0 +1,6 @@
+function Widget() {
+  // TODO
+  return <div>update profile</div>;
+}
+
+export default Widget;

+ 1 - 0
material-ui/src/react-app-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="react-scripts" />

+ 40 - 0
material-ui/src/reducers/current-user.ts

@@ -0,0 +1,40 @@
+import { createSlice, PayloadAction } from "@reduxjs/toolkit";
+
+import type { RootState } from "../store";
+
+interface IState {
+  id?: string;
+  roles?: string[];
+}
+
+const initialState: IState = {};
+
+export const slice = createSlice({
+  name: "current-user",
+  initialState,
+  reducers: {
+    signIn: (state, action: PayloadAction<string>) => {
+      console.log(action.payload);
+      state.id = "todo";
+      state.roles = [];
+    },
+    signOut: (state) => {
+      state = {};
+    },
+  },
+});
+
+export const { signIn, signOut } = slice.actions;
+
+const ADMINISTRATOR = "administrator";
+
+export const isSignIn = (state: RootState): boolean =>
+  state.currentUser.id !== undefined;
+export const isAdministrtor = (state: RootState): boolean =>
+  hasRole(state, ADMINISTRATOR);
+
+export const hasRole = (state: RootState, role: string): boolean =>
+  state.currentUser.roles !== undefined &&
+  state.currentUser.roles.includes(role);
+
+export default slice.reducer;

+ 35 - 0
material-ui/src/reducers/site-info.ts

@@ -0,0 +1,35 @@
+import { createSlice, PayloadAction } from "@reduxjs/toolkit";
+
+import type { RootState } from "../store";
+
+interface IState {
+  title: string;
+  subhead: string;
+  copyright: string;
+  languages: string[];
+}
+
+const initialState: IState = {
+  title: "",
+  subhead: "",
+  copyright: "",
+  languages: [],
+};
+
+const slice = createSlice({
+  name: "site-info",
+  initialState,
+  reducers: {
+    refresh: (state, action: PayloadAction<IState>) => {
+      Object.assign(state, action.payload);
+    },
+  },
+});
+
+export const { refresh } = slice.actions;
+
+export const selectSiteInfo = (state: RootState): IState => {
+  return { ...state.siteInfo };
+};
+
+export default slice.reducer;

+ 15 - 0
material-ui/src/reportWebVitals.ts

@@ -0,0 +1,15 @@
+import { ReportHandler } from 'web-vitals';
+
+const reportWebVitals = (onPerfEntry?: ReportHandler) => {
+  if (onPerfEntry && onPerfEntry instanceof Function) {
+    import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
+      getCLS(onPerfEntry);
+      getFID(onPerfEntry);
+      getFCP(onPerfEntry);
+      getLCP(onPerfEntry);
+      getTTFB(onPerfEntry);
+    });
+  }
+};
+
+export default reportWebVitals;

+ 1 - 0
material-ui/src/request.ts

@@ -0,0 +1 @@
+export const graphql = () => {};

+ 5 - 0
material-ui/src/setupTests.ts

@@ -0,0 +1,5 @@
+// jest-dom adds custom jest matchers for asserting on DOM nodes.
+// allows you to do things like:
+// expect(element).toHaveTextContent(/react/i)
+// learn more: https://github.com/testing-library/jest-dom
+import '@testing-library/jest-dom';

+ 17 - 0
material-ui/src/store.ts

@@ -0,0 +1,17 @@
+import { configureStore } from "@reduxjs/toolkit";
+
+import currentUser from "./reducers/current-user";
+import siteInfo from "./reducers/site-info";
+
+const store = configureStore({
+  reducer: {
+    currentUser,
+    siteInfo,
+  },
+});
+
+export type RootState = ReturnType<typeof store.getState>;
+
+export type AppDispatch = typeof store.dispatch;
+
+export default store;

+ 26 - 0
material-ui/tsconfig.json

@@ -0,0 +1,26 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "noFallthroughCasesInSwitch": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "react-jsx"
+  },
+  "include": [
+    "src"
+  ]
+}

+ 1 - 1
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) {

+ 1 - 1
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>

+ 2 - 2
public/app/public/book_index/a/default.json

@@ -39,8 +39,8 @@
 { "name":"kn15" , "row":"149" , "id":"p149" , "folder":"s0515m.mul" , "title":"Mahāniddesapāḷi" , "c1":"sutta" , "c2":"khuddaka" , "c3":"Mahāniddesa" , "c4":"" },
 { "name":"kn16" , "row":"150" , "id":"p150" , "folder":"s0516m.mul" , "title":"Cūḷaniddesapāḷi" , "c1":"sutta" , "c2":"khuddaka" , "c3":"Cūḷaniddesa" , "c4":"" },
 { "name":"kn17" , "row":"151" , "id":"p151" , "folder":"s0517m.mul" , "title":"Paṭisambhidāmaggapāḷi" , "c1":"sutta" , "c2":"khuddaka" , "c3":"Paṭisambhidāmagga" , "c4":"" },
-{ "name":"kn18" , "row":"152" , "id":"p153" , "folder":"s0518m.nrf" , "title":"Nettippakaraṇapāḷi" , "c1":"sutta" , "c2":"khuddaka" , "c3":"Nettippakaraṇa" , "c4":"" },
-{ "name":"kn19" , "row":"153" , "id":"p152" , "folder":"s0519m.mul" , "title":"Milindapañhapāḷi" , "c1":"sutta" , "c2":"khuddaka" , "c3":"Milindapañha" , "c4":"" },
+{ "name":"kn19" , "row":"153" , "id":"p153" , "folder":"s0518m.nrf" , "title":"Nettippakaraṇapāḷi" , "c1":"sutta" , "c2":"khuddaka" , "c3":"Nettippakaraṇa" , "c4":"" },
+{ "name":"kn18" , "row":"152" , "id":"p152" , "folder":"s0519m.mul" , "title":"Milindapañhapāḷi" , "c1":"sutta" , "c2":"khuddaka" , "c3":"Milindapañha" , "c4":"" },
 { "name":"kn20" , "row":"155" , "id":"p155" , "folder":"s0520m.nrf" , "title":"Peṭakopadesapāḷi" , "c1":"sutta" , "c2":"khuddaka" , "c3":"Peṭakopadesa" , "c4":"" },
 { "name":"vin1" , "row":"213" , "id":"p213" , "folder":"vin01m.mul" , "title":"Pārājikapāḷi" , "c1":"vinaya" , "c2":"Pārājika" , "c3":"" , "c4":"" },
 { "name":"vin2" , "row":"214" , "id":"p214" , "folder":"vin02m1.mul" , "title":"Pācittiyapāḷi" , "c1":"vinaya" , "c2":"Pācittiya" , "c3":"" , "c4":"" },

+ 2 - 2
public/app/public/book_index/a/en.json

@@ -39,8 +39,8 @@
 { "name":"kn15" , "row":"149" , "id":"p149" , "folder":"s0515m.mul" , "title":"Mahāniddesapāḷi" , "c1":"sutta" , "c2":"khuddaka" , "c3":"Mahāniddesa" , "c4":"" },
 { "name":"kn16" , "row":"150" , "id":"p150" , "folder":"s0516m.mul" , "title":"Cūḷaniddesapāḷi" , "c1":"sutta" , "c2":"khuddaka" , "c3":"Cūḷaniddesa" , "c4":"" },
 { "name":"kn17" , "row":"151" , "id":"p151" , "folder":"s0517m.mul" , "title":"Paṭisambhidāmaggapāḷi" , "c1":"sutta" , "c2":"khuddaka" , "c3":"Paṭisambhidāmagga" , "c4":"" },
-{ "name":"kn18" , "row":"152" , "id":"p153" , "folder":"s0518m.nrf" , "title":"Nettippakaraṇapāḷi" , "c1":"sutta" , "c2":"khuddaka" , "c3":"Nettippakaraṇa" , "c4":"" },
-{ "name":"kn19" , "row":"153" , "id":"p152" , "folder":"s0519m.mul" , "title":"Milindapañhapāḷi" , "c1":"sutta" , "c2":"khuddaka" , "c3":"Milindapañha" , "c4":"" },
+{ "name":"kn19" , "row":"153" , "id":"p153" , "folder":"s0518m.nrf" , "title":"Nettippakaraṇapāḷi" , "c1":"sutta" , "c2":"khuddaka" , "c3":"Nettippakaraṇa" , "c4":"" },
+{ "name":"kn18" , "row":"152" , "id":"p152" , "folder":"s0519m.mul" , "title":"Milindapañhapāḷi" , "c1":"sutta" , "c2":"khuddaka" , "c3":"Milindapañha" , "c4":"" },
 { "name":"kn20" , "row":"155" , "id":"p155" , "folder":"s0520m.nrf" , "title":"Peṭakopadesapāḷi" , "c1":"sutta" , "c2":"khuddaka" , "c3":"Peṭakopadesa" , "c4":"" },
 { "name":"vin1" , "row":"213" , "id":"p213" , "folder":"vin01m.mul" , "title":"Pārājikapāḷi" , "c1":"vinaya" , "c2":"Pārājika" , "c3":"" , "c4":"" },
 { "name":"vin2" , "row":"214" , "id":"p214" , "folder":"vin02m1.mul" , "title":"Pācittiyapāḷi" , "c1":"vinaya" , "c2":"Pācittiya" , "c3":"" , "c4":"" },

+ 2 - 2
public/app/public/book_index/a/my.json

@@ -94,11 +94,11 @@
 { "name":"k-kn22" , "row":"119" , "id":"p119" , "folder":"s0516a.att" , "title":"စူဠနိဒ္ဒေသ-အဋ္ဌကထာ" , "c1":"သုတ္တ" , "c2":"ခုဒ္ဒက" , "c3":"စူဠနိဒ္ဒေသ" , "c4":"" },
 { "name":"kn17" , "row":"151" , "id":"p151" , "folder":"s0517m.mul" , "title":"ပဋိသမ္ဘိဒာမဂ္ဂပာဠိ" , "c1":"သုတ္တ" , "c2":"ခုဒ္ဒက" , "c3":"ပဋိသမ္ဘိဒာမဂ္ဂ" , "c4":"" },
 { "name":"k-kn23" , "row":"120" , "id":"p120" , "folder":"s0517a.att" , "title":"ပဋိသမ္ဘိဒာမဂ္ဂ-အဋ္ဌကထာ(ပဌမော ဘာဂော)" , "c1":"သုတ္တ" , "c2":"ခုဒ္ဒက" , "c3":"ပဋိသမ္ဘိဒာမဂ္ဂ" , "c4":"" },
-{ "name":"kn18" , "row":"152" , "id":"p153" , "folder":"s0518m.nrf" , "title":"နေတ္တိပ္ပကရဏပာဠိ" , "c1":"သုတ္တ" , "c2":"ခုဒ္ဒက" , "c3":"နေတ္တိပ္ပကရဏ" , "c4":"" },
+{ "name":"kn19" , "row":"153" , "id":"p153" , "folder":"s0518m.nrf" , "title":"နေတ္တိပ္ပကရဏပာဠိ" , "c1":"သုတ္တ" , "c2":"ခုဒ္ဒက" , "c3":"နေတ္တိပ္ပကရဏ" , "c4":"" },
 { "name":"k-kn24" , "row":"121" , "id":"p121" , "folder":"s0519a.att" , "title":"နေတ္တိပ္ပကရဏ-အဋ္ဌကထာ" , "c1":"သုတ္တ" , "c2":"ခုဒ္ဒက" , "c3":"နေတ္တိပ္ပကရဏ" , "c4":"" },
 { "name":"t-kn1" , "row":"190" , "id":"p190" , "folder":"s0519t.tik" , "title":"နေတ္တိပ္ပကရဏ-ဋီကာ" , "c1":"သုတ္တ" , "c2":"ခုဒ္ဒက" , "c3":"နေတ္တိပ္ပကရဏ" , "c4":"" },
 { "name":"t-kn2" , "row":"191" , "id":"p191" , "folder":"s0501t.nrf" , "title":"နေတ္တိဝိဘာဝိနီ" , "c1":"သုတ္တ" , "c2":"ခုဒ္ဒက" , "c3":"နေတ္တိပ္ပကရဏ" , "c4":"" },
-{ "name":"kn19" , "row":"153" , "id":"p152" , "folder":"s0519m.mul" , "title":"မိလိန္ဒပဉ္ဟပာဠိ" , "c1":"သုတ္တ" , "c2":"ခုဒ္ဒက" , "c3":"မိလိန္ဒပဉ္ဟ" , "c4":"" },
+{ "name":"kn18" , "row":"152" , "id":"p152" , "folder":"s0519m.mul" , "title":"မိလိန္ဒပဉ္ဟပာဠိ" , "c1":"သုတ္တ" , "c2":"ခုဒ္ဒက" , "c3":"မိလိန္ဒပဉ္ဟ" , "c4":"" },
 { "name":"a-sih10" , "row":"46" , "id":"p46" , "folder":"e1210n.nrf" , "title":"မိလိဒဋီကာ" , "c1":"သုတ္တ" , "c2":"ခုဒ္ဒက" , "c3":"မိလိန္ဒပဉ္ဟ" , "c4":"" },
 { "name":"kn20" , "row":"155" , "id":"p155" , "folder":"s0520m.nrf" , "title":"ပေဋကောပဒေသပာဠိ" , "c1":"သုတ္တ" , "c2":"ခုဒ္ဒက" , "c3":"ပေဋကောပဒေသ" , "c4":"" },
 { "name":"vin1" , "row":"213" , "id":"p213" , "folder":"vin01m.mul" , "title":"ပာရာဇိကပာဠိ" , "c1":"ဝိနယ" , "c2":"ပာရာဇိက" , "c3":"" , "c4":"" },

+ 3 - 3
public/app/public/book_index/a/zh-cn.json

@@ -38,9 +38,9 @@
 	{ "name":"kn14b" , "row":"147" , "id":"p147" , "folder":"s0514m.mul" , "title":"本生卷二(17-22集)" , "c1":"经藏" , "c2":"小部" , "c3":"本生" , "c4":"" },
 	{ "name":"kn15" , "row":"149" , "id":"p149" , "folder":"s0515m.mul" , "title":"大义释-根本" , "c1":"经藏" , "c2":"小部" , "c3":"大义释" , "c4":"" },
 	{ "name":"kn16" , "row":"150" , "id":"p150" , "folder":"s0516m.mul" , "title":"小义释-根本" , "c1":"经藏" , "c2":"小部" , "c3":"小义释" , "c4":"" },
-	{ "name":"kn17" , "row":"151" , "id":"p151" , "folder":"s0517m.mul" , "title":"无碍解道-根本" , "c1":"经藏" , "c2":"小部" , "c3":"无碍解道" , "c4":"" },
-	{ "name":"kn18" , "row":"152" , "id":"p153" , "folder":"s0518m.nrf" , "title":"导论-根本" , "c1":"经藏" , "c2":"小部" , "c3":"导论" , "c4":"" },
-	{ "name":"kn19" , "row":"153" , "id":"p152" , "folder":"s0519m.mul" , "title":"弥林达问经-根本" , "c1":"经藏" , "c2":"小部" , "c3":"弥林达问经" , "c4":"" },
+	{ "name":"kn17" , "row":"153" , "id":"p153" , "folder":"s0518m.nrf" , "title":"导论-根本" , "c1":"经藏" , "c2":"小部" , "c3":"导论" , "c4":"" },
+	{ "name":"kn18" , "row":"151" , "id":"p151" , "folder":"s0517m.mul" , "title":"无碍解道-根本" , "c1":"经藏" , "c2":"小部" , "c3":"无碍解道" , "c4":"" },
+	{ "name":"kn19" , "row":"152" , "id":"p152" , "folder":"s0519m.mul" , "title":"弥林达问经-根本" , "c1":"经藏" , "c2":"小部" , "c3":"弥林达问经" , "c4":"" },
 	{ "name":"kn20" , "row":"155" , "id":"p155" , "folder":"s0520m.nrf" , "title":"藏释-根本" , "c1":"经藏" , "c2":"小部" , "c3":"藏释" , "c4":"" },
 	{ "name":"vin1" , "row":"213" , "id":"p213" , "folder":"vin01m.mul" , "title":"律藏·巴拉基咖-根本" , "c1":"律藏" , "c2":"经分别" , "c3":"巴拉基咖" , "c4":"" },
 	{ "name":"vin2" , "row":"214" , "id":"p214" , "folder":"vin02m1.mul" , "title":"律藏·巴吉蒂亚-根本" , "c1":"律藏" , "c2":"经分别" , "c3":"巴吉蒂亚" , "c4":"" },

+ 2 - 2
public/app/public/book_index/a/zh-tw.json

@@ -39,8 +39,8 @@
 	{ "name":"kn15" , "row":"149" , "id":"p149" , "folder":"s0515m.mul" , "title":"大義釋-根本" , "c1":"經藏" , "c2":"小部" , "c3":"大義釋" , "c4":"" },
 	{ "name":"kn16" , "row":"150" , "id":"p150" , "folder":"s0516m.mul" , "title":"小義釋-根本" , "c1":"經藏" , "c2":"小部" , "c3":"小義釋" , "c4":"" },
 	{ "name":"kn17" , "row":"151" , "id":"p151" , "folder":"s0517m.mul" , "title":"無礙解道-根本" , "c1":"經藏" , "c2":"小部" , "c3":"無礙解道" , "c4":"" },
-	{ "name":"kn18" , "row":"152" , "id":"p153" , "folder":"s0518m.nrf" , "title":"導論-根本" , "c1":"經藏" , "c2":"小部" , "c3":"導論" , "c4":"" },
-	{ "name":"kn19" , "row":"153" , "id":"p152" , "folder":"s0519m.mul" , "title":"彌林達問經-根本" , "c1":"經藏" , "c2":"小部" , "c3":"彌林達問經" , "c4":"" },
+	{ "name":"kn19" , "row":"153" , "id":"p153" , "folder":"s0518m.nrf" , "title":"導論-根本" , "c1":"經藏" , "c2":"小部" , "c3":"導論" , "c4":"" },
+	{ "name":"kn18" , "row":"152" , "id":"p152" , "folder":"s0519m.mul" , "title":"彌林達問經-根本" , "c1":"經藏" , "c2":"小部" , "c3":"彌林達問經" , "c4":"" },
 	{ "name":"kn20" , "row":"155" , "id":"p155" , "folder":"s0520m.nrf" , "title":"藏釋-根本" , "c1":"經藏" , "c2":"小部" , "c3":"藏釋" , "c4":"" },
 	{ "name":"vin1" , "row":"213" , "id":"p213" , "folder":"vin01m.mul" , "title":"律藏·巴拉基咖-根本" , "c1":"律藏" , "c2":"經分別" , "c3":"巴拉基咖" , "c4":"" },
 	{ "name":"vin2" , "row":"214" , "id":"p214" , "folder":"vin02m1.mul" , "title":"律藏·巴吉蒂亞-根本" , "c1":"律藏" , "c2":"經分別" , "c3":"巴吉蒂亞" , "c4":"" },

+ 14 - 23
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" }, //后加

+ 4 - 3
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" }, //后加

+ 1 - 0
public/app/public/lang/default.json

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

+ 1 - 0
public/app/public/lang/en.json

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

+ 125 - 144
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": "&nbsp;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&nbsp;",
+		"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": "ပေါ်&nbsp;&&nbsp;အောက်",
+		"color": "အရောင်",
+		"column_compare": "Up&nbsp;&&nbsp;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": "&nbsp;",
-		"day_1": "&nbsp;",
-		"days": "&nbsp;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": "&nbsp;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": "&nbsp;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": "&nbsp;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&nbsp;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": "&nbsp;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&nbsp;",
+		"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": "&nbsp;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&nbsp;",
 		"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": "&nbsp;dictionary",
-		"row_compare": "ဘယ်&nbsp;&&nbsp;ညာ",
-		"same_word": "same words",
+		"row_compare": "Left&nbsp;&&nbsp;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&nbsp;Code",
-		"subversion": "Subversion",
-		"success": "&nbsp;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&nbsp;",
 		"to_the_dhamma": "&nbsp;to the Dhamma&nbsp;",
-		"today": "Today ",
+		"today": "ယနေ့ ",
 		"toDB": "To User Database",
 		"tools": "Tools",
 		"total": "Total&nbsp;",
 		"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&nbsp;",
-		"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": "&nbsp;words",
-		"wordtype": "Word Type",
+		"wordtype": "စကားလုံးအမျိုးအစား",
 		"workload": "workload",
 		"xml_data": "XML Data",
-		"year": "(year)",
-		"year_0": "year",
-		"year_1": "- ",
-		"years": "&nbsp;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": "&nbsp;",
+		"channel_type": "channel type",
 		"": ""
 	},
 	"grammastr": [

+ 1 - 0
public/app/public/lang/si.json

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

+ 1 - 0
public/app/public/lang/zh-cn.json

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

+ 1 - 0
public/app/public/lang/zh-tw.json

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

+ 29 - 2
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",
@@ -1118,10 +1118,37 @@ var list_relation=[
     {
         "id": "CAU",
         "case": ".abs.",
+        "note": "hetu ➡ phala",
+        "sys_name": "Sadda Pan Goun",
+        "author": "Ven. Pandita Pariyatti Faculty ITBMU",
+        "editor": "Bhikkhu Kosalla sy1987",
+        "language": "default"
+    },
+    {
+        "id": "CAU",
+        "case": ".ger.",
         "note": "Causality Relation",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
+        "language": "en"
+    },
+    {
+        "id": "CAU",
+        "case": ".ger.",
+        "note": "因 ➡ 果",
+        "sys_name": "Sadda Pan Goun",
+        "author": "Ven. Pandita Pariyatti Faculty ITBMU",
+        "editor": "Bhikkhu Kosalla sy1987",
+        "language": "zh-cn"
+    },
+    {
+        "id": "CAU",
+        "case": ".ger.",
+        "note": "hetu ➡ phala",
+        "sys_name": "Sadda Pan Goun",
+        "author": "Ven. Pandita Pariyatti Faculty ITBMU",
+        "editor": "Bhikkhu Kosalla sy1987",
         "language": "default"
     },
     {

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

@@ -0,0 +1,3 @@
+# 缅文语尾
+
+连续体

Some files were not shown because too many files changed in this diff