Merge pull request #3 from ryugibo/master

Enable Multilingual
2017-04-06 14:15:03 +03:00 · 2017-04-06 14:15:03 +03:00 · 27e9b6f85c
parent 16e9542711 c4d2a3afac
commit 27e9b6f85c
43 changed files with 150 additions and 76 deletions
--- a/exampleSite/static/assets/css/styles-2.css
+++ b/exampleSite/static/assets/css/styles-2.css
@ -131,7 +131,7 @@ p {
  font-weight: 500;
  margin-bottom: 0px;
 }
-.sidebar-wrapper .languages-container .lang-desc {
+.sidebar-wrapper .language-container .lang-desc {
  color: rgba(255, 255, 255, 0.6);
 }
 .sidebar-wrapper .languages-list {
--- a/exampleSite/static/assets/css/styles-3.css
+++ b/exampleSite/static/assets/css/styles-3.css
@ -131,7 +131,7 @@ p {
  font-weight: 500;
  margin-bottom: 0px;
 }
-.sidebar-wrapper .languages-container .lang-desc {
+.sidebar-wrapper .language-container .lang-desc {
  color: rgba(255, 255, 255, 0.6);
 }
 .sidebar-wrapper .languages-list {
--- a/exampleSite/static/assets/css/styles-4.css
+++ b/exampleSite/static/assets/css/styles-4.css
@ -131,7 +131,7 @@ p {
  font-weight: 500;
  margin-bottom: 0px;
 }
-.sidebar-wrapper .languages-container .lang-desc {
+.sidebar-wrapper .language-container .lang-desc {
  color: rgba(255, 255, 255, 0.6);
 }
 .sidebar-wrapper .languages-list {
--- a/exampleSite/static/assets/css/styles-5.css
+++ b/exampleSite/static/assets/css/styles-5.css
@ -131,7 +131,7 @@ p {
  font-weight: 500;
  margin-bottom: 0px;
 }
-.sidebar-wrapper .languages-container .lang-desc {
+.sidebar-wrapper .language-container .lang-desc {
  color: rgba(255, 255, 255, 0.6);
 }
 .sidebar-wrapper .languages-list {
--- a/exampleSite/static/assets/css/styles-6.css
+++ b/exampleSite/static/assets/css/styles-6.css
@ -131,7 +131,7 @@ p {
  font-weight: 500;
  margin-bottom: 0px;
 }
-.sidebar-wrapper .languages-container .lang-desc {
+.sidebar-wrapper .language-container .lang-desc {
  color: rgba(255, 255, 255, 0.6);
 }
 .sidebar-wrapper .languages-list {
--- a/exampleSite/static/assets/css/styles.css
+++ b/exampleSite/static/assets/css/styles.css
@ -131,7 +131,7 @@ p {
  font-weight: 500;
  margin-bottom: 0px;
 }
-.sidebar-wrapper .languages-container .lang-desc {
+.sidebar-wrapper .language-container .lang-desc {
  color: rgba(255, 255, 255, 0.6);
 }
 .sidebar-wrapper .languages-list {
--- a/exampleSite/static/assets/less/css/styles.css
+++ b/exampleSite/static/assets/less/css/styles.css
@ -131,7 +131,7 @@ p {
  font-weight: 500;
  margin-bottom: 0px;
 }
-.sidebar-wrapper .languages-container .lang-desc {
+.sidebar-wrapper .language-container .lang-desc {
  color: rgba(255, 255, 255, 0.6);
 }
 .sidebar-wrapper .languages-list {
--- a/exampleSite/static/assets/less/default/base.less
+++ b/exampleSite/static/assets/less/default/base.less
@ -123,7 +123,7 @@ p {
            margin-bottom: 0px;
        }
    }
-    .languages-container {
+    .language-container {
        .lang-desc {
            color: rgba(256, 256, 256, 0.6);
        }
--- a/exampleSite/static/assets/less/theme-2/base.less
+++ b/exampleSite/static/assets/less/theme-2/base.less
@ -123,7 +123,7 @@ p {
            margin-bottom: 0px;
        }
    }
-    .languages-container {
+    .language-container {
        .lang-desc {
            color: rgba(256, 256, 256, 0.6);
        }
--- a/exampleSite/static/assets/less/theme-3/base.less
+++ b/exampleSite/static/assets/less/theme-3/base.less
@ -123,7 +123,7 @@ p {
            margin-bottom: 0px;
        }
    }
-    .languages-container {
+    .language-container {
        .lang-desc {
            color: rgba(256, 256, 256, 0.6);
        }
--- a/exampleSite/static/assets/less/theme-4/base.less
+++ b/exampleSite/static/assets/less/theme-4/base.less
@ -123,7 +123,7 @@ p {
            margin-bottom: 0px;
        }
    }
-    .languages-container {
+    .language-container {
        .lang-desc {
            color: rgba(256, 256, 256, 0.6);
        }
--- a/exampleSite/static/assets/less/theme-5/base.less
+++ b/exampleSite/static/assets/less/theme-5/base.less
@ -123,7 +123,7 @@ p {
            margin-bottom: 0px;
        }
    }
-    .languages-container {
+    .language-container {
        .lang-desc {
            color: rgba(256, 256, 256, 0.6);
        }
--- a/exampleSite/static/assets/less/theme-6/base.less
+++ b/exampleSite/static/assets/less/theme-6/base.less
@ -123,7 +123,7 @@ p {
            margin-bottom: 0px;
        }
    }
-    .languages-container {
+    .language-container {
        .lang-desc {
            color: rgba(256, 256, 256, 0.6);
        }
--- a/i18n/en.yaml
+++ b/i18n/en.yaml
@ -0,0 +1,14 @@
+- id: education
+  translation: Education
+- id: experiences
+  translation: Experiences
+- id: interests
+  translation: Interests
+- id: language
+  translation: Languages
+- id: projects
+  translation: Projects
+- id: skills
+  translation: Skills & Proficiency
+- id: summary
+  translation: Career Profile
--- a/i18n/ja.yaml
+++ b/i18n/ja.yaml
@ -0,0 +1,14 @@
+- id: education
+  translation: 学歴
+- id: experiences
+  translation: 経歴
+- id: interests
+  translation: 趣味
+- id: language
+  translation: 言語能力
+- id: projects
+  translation: プロジェクト
+- id: skills
+  translation: 技術 & 熟練度
+- id: summary
+  translation: 紹介
--- a/i18n/ko.yaml
+++ b/i18n/ko.yaml
@ -0,0 +1,14 @@
+- id: education
+  translation: 학력
+- id: experiences
+  translation: 경력
+- id: interests
+  translation: 취미
+- id: language
+  translation: 언어능력
+- id: projects
+  translation: 프로젝트
+- id: skills
+  translation: 기술 & 숙련도
+- id: summary
+  translation: 소개
--- a/layouts/index.html
+++ b/layouts/index.html
@ -35,4 +35,3 @@
    {{ partial "scripts.html" . }}
 </body>
 </html>
-
--- a/layouts/partials/education.html
+++ b/layouts/partials/education.html
@ -1,5 +1,5 @@
            <div class="education-container container-block">
-                <h2 class="container-block-title">{{ .Site.Params.education.title }}</h2>
+                <h2 class="container-block-title">{{ i18n "education" }}</h2>
 				{{ range .Site.Params.education.list }}
                <div class="item">
                    <h4 class="degree">{{ .degree }}</h4>
--- a/layouts/partials/experiences.html
+++ b/layouts/partials/experiences.html
@ -1,5 +1,5 @@
            <section class="section experiences-section">
-                <h2 class="section-title"><i class="fa {{ .Site.Params.experiences.icon }}"></i>{{ .Site.Params.experiences.title }}</h2>
+                <h2 class="section-title"><i class="fa {{ .Site.Params.experiences.icon }}"></i>{{ i18n "experiences" }}</h2>

 				{{ range .Site.Params.jobs.list }}
                <div class="item">
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@ -1,10 +1,10 @@
-    <title>{{ .Site.Title }}</title>
+    <title>{{ .Site.Params.title }}</title>
    <!-- Meta -->
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="{{ with .Site.Params.description }}{{ . }}{{ end }}">
-    <meta name="author" content="{{ with .Site.Params.author }}{{ . }}{{ end }}">    
+    <meta name="description" content="{{ .Site.Params.description }}">
+    <meta name="author" content="{{ .Site.Params.author }}">
    <link rel="shortcut icon" href="favicon.ico">
    <link href='https://fonts.googleapis.com/css?family=Roboto:400,500,400italic,300italic,300,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
    <!-- Global CSS -->
--- a/layouts/partials/interests.html
+++ b/layouts/partials/interests.html
@ -1,5 +1,5 @@
            <div class="interests-container container-block">
-                <h2 class="container-block-title">{{ .Site.Params.interests.title }}</h2>
+                <h2 class="container-block-title">{{ i18n "interests" }}</h2>
                <ul class="list-unstyled interests-list">
 				{{ range .Site.Params.interests.list }}
                    <li>{{ .interest }}</li>
--- a/layouts/partials/lang.html
+++ b/layouts/partials/lang.html
@ -1,3 +1,3 @@
-<!--[if IE 8]> <html lang="{{ with .Site.LanguageCode }}{{ . }}{{ else }}en-US{{ end }}" class="ie8"> <![endif]-->  
-<!--[if IE 9]> <html lang="{{ with .Site.LanguageCode }}{{ . }}{{ else }}en-US{{ end }}" class="ie9"> <![endif]-->  
-<!--[if !IE]><!--> <html lang="{{ with .Site.LanguageCode }}{{ . }}{{ else }}en-US{{ end }}"> <!--<![endif]-->
+<!--[if IE 8]> <html lang="{{ .Site.Language }}" class="ie8"> <![endif]-->
+<!--[if IE 9]> <html lang="{{ .Site.Language }}" class="ie9"> <![endif]-->
+<!--[if !IE]><!--> <html lang="{{ .Site.Language }}"> <!--<![endif]-->
--- a/layouts/partials/language.html
+++ b/layouts/partials/language.html
@ -0,0 +1,8 @@
+            <div class="language-container container-block">
+                <h2 class="container-block-title">{{ i18n "language" }}</h2>
+                <ul class="list-unstyled interests-list">
+				{{ range .Site.Params.language.list }}
+                    <li>{{ .language }} <span class="lang-desc">({{ .level }})</span></li>
+				{{ end }}
+                </ul>
+            </div><!--//language-->
--- a/layouts/partials/languages.html
+++ b/layouts/partials/languages.html
@ -1,8 +0,0 @@
-            <div class="languages-container container-block">
-                <h2 class="container-block-title">{{ .Site.Params.languages.title }}</h2>
-                <ul class="list-unstyled interests-list">
-				{{ range .Site.Params.languages.list }}
-                    <li>{{ .language }} <span class="lang-desc">({{ .level }})</span></li>
-				{{ end }}
-                </ul>
-            </div><!--//languages-->
--- a/layouts/partials/projects.html
+++ b/layouts/partials/projects.html
@ -1,5 +1,5 @@
            <section class="section projects-section">
-                <h2 class="section-title"><i class="fa {{ .Site.Params.projects.icon }}"></i>{{ .Site.Params.projects.title }}</h2>
+                <h2 class="section-title"><i class="fa {{ .Site.Params.projects.icon }}"></i>{{ i18n "projects" }}</h2>
                <div class="intro">
                    <p>{{ with .Site.Params.projects.intro }}{{ . | markdownify }}{{ end }}</p>
                </div><!--//intro-->
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@ -2,6 +2,10 @@

 		{{ partial "profile.html" . }}

+		{{ if .IsTranslated }}
+		{{ partial "translate.html" . }}
+		{{ end }}
+
 		{{ if .Site.Params.contact.enable }}
 		{{ partial "contact.html" . }}
 		{{ end }}
@ -10,8 +14,8 @@
 		{{ partial "education.html" . }}
 		{{ end }}

-		{{ if .Site.Params.languages.enable }}
-		{{ partial "languages.html" . }}
+		{{ if .Site.Params.language.enable }}
+		{{ partial "language.html" . }}
 		{{ end }}

 		{{ if .Site.Params.interests.enable }}
--- a/layouts/partials/skills.html
+++ b/layouts/partials/skills.html
@ -1,5 +1,5 @@
            <section class="skills-section section">
-                <h2 class="section-title"><i class="fa {{ .Site.Params.skills.icon }}"></i>{{ .Site.Params.skills.title }}</h2>
+                <h2 class="section-title"><i class="fa {{ .Site.Params.skills.icon }}"></i>{{ i18n "skills" }}</h2>
                <div class="skillset">
 				{{ range .Site.Params.skills.list }}
                    <div class="item">
--- a/layouts/partials/summary.html
+++ b/layouts/partials/summary.html
@ -1,5 +1,5 @@
            <section class="section summary-section">
-                <h2 class="section-title"><i class="fa {{ .Site.Params.summary.icon }}"></i>{{ .Site.Params.summary.title }}</h2>
+                <h2 class="section-title"><i class="fa {{ .Site.Params.summary.icon }}"></i>{{ i18n "summary" }}</h2>
                <div class="summary">
                    <p>{{ with .Site.Params.summary.summary }}{{ . | markdownify }}{{ end }}</p>
                </div><!--//summary-->
--- a/layouts/partials/translate.html
+++ b/layouts/partials/translate.html
@ -0,0 +1,5 @@
+            <div class="profile-container">
+                {{ range .Translations }}
+                <a class="btn btn-translate" href="{{ .Permalink }}">{{upper .Lang }}</a>
+                {{ end }}
+            </div><!--//profile-container-->
--- a/static/assets/css/styles-2.css
+++ b/static/assets/css/styles-2.css
@ -131,7 +131,7 @@ p {
  font-weight: 500;
  margin-bottom: 0px;
 }
-.sidebar-wrapper .languages-container .lang-desc {
+.sidebar-wrapper .language-container .lang-desc {
  color: rgba(255, 255, 255, 0.6);
 }
 .sidebar-wrapper .languages-list {
@ -258,6 +258,10 @@ p {
 .footer .fa-heart {
  color: #fb866a;
 }
+.btn-translate {
+  background-color: #2f6a61;
+  border-color: #4eb1a2;
+}
 /* Extra small devices (phones, less than 768px) */
@media (max-width: 767px) {
  .sidebar-wrapper {
--- a/static/assets/css/styles-3.css
+++ b/static/assets/css/styles-3.css
@ -131,7 +131,7 @@ p {
  font-weight: 500;
  margin-bottom: 0px;
 }
-.sidebar-wrapper .languages-container .lang-desc {
+.sidebar-wrapper .language-container .lang-desc {
  color: rgba(255, 255, 255, 0.6);
 }
 .sidebar-wrapper .languages-list {
@ -258,6 +258,10 @@ p {
 .footer .fa-heart {
  color: #fb866a;
 }
+.btn-translate {
+  background-color: #3c7749;
+  border-color: #66b277;
+}
 /* Extra small devices (phones, less than 768px) */
@media (max-width: 767px) {
  .sidebar-wrapper {
--- a/static/assets/css/styles-4.css
+++ b/static/assets/css/styles-4.css
@ -131,7 +131,7 @@ p {
  font-weight: 500;
  margin-bottom: 0px;
 }
-.sidebar-wrapper .languages-container .lang-desc {
+.sidebar-wrapper .language-container .lang-desc {
  color: rgba(255, 255, 255, 0.6);
 }
 .sidebar-wrapper .languages-list {
@ -258,6 +258,10 @@ p {
 .footer .fa-heart {
  color: #fb866a;
 }
+.btn-translate {
+  background-color: #65344b;
+  border-color: #a8577d;
+}
 /* Extra small devices (phones, less than 768px) */
@media (max-width: 767px) {
  .sidebar-wrapper {
--- a/static/assets/css/styles-5.css
+++ b/static/assets/css/styles-5.css
@ -131,7 +131,7 @@ p {
  font-weight: 500;
  margin-bottom: 0px;
 }
-.sidebar-wrapper .languages-container .lang-desc {
+.sidebar-wrapper .language-container .lang-desc {
  color: rgba(255, 255, 255, 0.6);
 }
 .sidebar-wrapper .languages-list {
@ -258,6 +258,10 @@ p {
 .footer .fa-heart {
  color: #fb866a;
 }
+.btn-translate {
+  background-color: #a2662a;
+  border-color: #d5995d;
+}
 /* Extra small devices (phones, less than 768px) */
@media (max-width: 767px) {
  .sidebar-wrapper {
--- a/static/assets/css/styles-6.css
+++ b/static/assets/css/styles-6.css
@ -131,7 +131,7 @@ p {
  font-weight: 500;
  margin-bottom: 0px;
 }
-.sidebar-wrapper .languages-container .lang-desc {
+.sidebar-wrapper .language-container .lang-desc {
  color: rgba(255, 255, 255, 0.6);
 }
 .sidebar-wrapper .languages-list {
@ -258,6 +258,10 @@ p {
 .footer .fa-heart {
  color: #fb866a;
 }
+.btn-translate {
+  background-color: #27383f;
+  border-color: #4f6f7d;
+}
 /* Extra small devices (phones, less than 768px) */
@media (max-width: 767px) {
  .sidebar-wrapper {
--- a/static/assets/css/styles.css
+++ b/static/assets/css/styles.css
@ -131,7 +131,7 @@ p {
  font-weight: 500;
  margin-bottom: 0px;
 }
-.sidebar-wrapper .languages-container .lang-desc {
+.sidebar-wrapper .language-container .lang-desc {
  color: rgba(255, 255, 255, 0.6);
 }
 .sidebar-wrapper .languages-list {
@ -258,6 +258,10 @@ p {
 .footer .fa-heart {
  color: #fb866a;
 }
+.btn-translate {
+  background-color: #276472;
+  border-color: #41a7be;
+}
 /* Extra small devices (phones, less than 768px) */
@media (max-width: 767px) {
  .sidebar-wrapper {
--- a/static/assets/less/css/styles.css
+++ b/static/assets/less/css/styles.css
@ -131,7 +131,7 @@ p {
  font-weight: 500;
  margin-bottom: 0px;
 }
-.sidebar-wrapper .languages-container .lang-desc {
+.sidebar-wrapper .language-container .lang-desc {
  color: rgba(255, 255, 255, 0.6);
 }
 .sidebar-wrapper .languages-list {
--- a/static/assets/less/default/base.less
+++ b/static/assets/less/default/base.less
@ -123,7 +123,7 @@ p {
            margin-bottom: 0px;
        }
    }
-    .languages-container {
+    .language-container {
        .lang-desc {
            color: rgba(256, 256, 256, 0.6);
        }
--- a/static/assets/less/theme-2/base.less
+++ b/static/assets/less/theme-2/base.less
@ -123,7 +123,7 @@ p {
            margin-bottom: 0px;
        }
    }
-    .languages-container {
+    .language-container {
        .lang-desc {
            color: rgba(256, 256, 256, 0.6);
        }
--- a/static/assets/less/theme-3/base.less
+++ b/static/assets/less/theme-3/base.less
@ -123,7 +123,7 @@ p {
            margin-bottom: 0px;
        }
    }
-    .languages-container {
+    .language-container {
        .lang-desc {
            color: rgba(256, 256, 256, 0.6);
        }
--- a/static/assets/less/theme-4/base.less
+++ b/static/assets/less/theme-4/base.less
@ -123,7 +123,7 @@ p {
            margin-bottom: 0px;
        }
    }
-    .languages-container {
+    .language-container {
        .lang-desc {
            color: rgba(256, 256, 256, 0.6);
        }
--- a/static/assets/less/theme-5/base.less
+++ b/static/assets/less/theme-5/base.less
@ -123,7 +123,7 @@ p {
            margin-bottom: 0px;
        }
    }
-    .languages-container {
+    .language-container {
        .lang-desc {
            color: rgba(256, 256, 256, 0.6);
        }
--- a/static/assets/less/theme-6/base.less
+++ b/static/assets/less/theme-6/base.less
@ -123,7 +123,7 @@ p {
            margin-bottom: 0px;
        }
    }
-    .languages-container {
+    .language-container {
        .lang-desc {
            color: rgba(256, 256, 256, 0.6);
        }