Merge pull request #100 from artem-solovev/complex/release-following-…

…8.2.12

Release following 8.2.12

.env

@@ -1,3 +1,3 @@
-APP_VERSION=8.2.12
+APP_VERSION=8.2.20
 PAYPAL_URL=https://www.paypal.me/ArtemSolovev
 OPENCOLLECTIVE_URL=https://opencollective.com/artem-solovev

README.md

@@ -3,14 +3,18 @@
 ![Chrome Web Store](https://img.shields.io/chrome-web-store/rating-count/kaodcnpebhdbpaeeemkiobcokcnegdki.svg?style=flat-square)
 ___
 
-# Browser extension GLOC ( [Chrome](https://chrome.google.com/webstore/detail/gloc-github-counter-lines/kaodcnpebhdbpaeeemkiobcokcnegdki?utm_source=chrome-ntp-icon), [Opera](), [Firefox](https://addons.mozilla.org/en-US/firefox/addon/gloc/) )
+# Browser extension GLOC ( [Chrome](https://chrome.google.com/webstore/detail/gloc-github-counter-lines/kaodcnpebhdbpaeeemkiobcokcnegdki?utm_source=chrome-ntp-icon), [Opera](https://addons.opera.com/en/extensions/details/github-gloc/), [Firefox](https://addons.mozilla.org/en-US/firefox/addon/gloc/), [Edge](https://microsoftedge.microsoft.com/addons/detail/github-gloc/kajgeahhljoinicmpkogimkcpecnnihh?hl=en-GB) )
 ![Chrome](screens/browsers/chrome.png)
 ![Opera](screens/browsers/opera.png)
 ![Firefox](screens/browsers/firefox.png)
+![EDGE](screens/browsers/edge.png)
+
+## DISCLAIMER
+### Github does not have a function to view the total number of lines of code in the project but we can to compute an approximation of that data (LOC: Lines of Code) through the GitHub Statistics API. Some glitches may occur, such as negative loc or <unavailable data> for many reasons
 
 ## History
 ### Version:
-- current: 8.2.12 ( 2020, 7 june )
+- current: 8.2.19 ( 2020, 12 july )
 - initial: 2.0.1 ( 2017, 12 february )
 
 I made this program in the Russian Army while I was on duty. I was coding as fast as i could )))
@@ -39,6 +43,7 @@ Counts lines of code in:
 - Portuguese (Brazil)
 - Russian
 - Spanish (Latin America and Caribbean)
+- Vietnamese
 - Ukrainian
 
 **Gloc** means - 'Github lines of code counter'
@@ -63,12 +68,17 @@ Counts lines of code in:
 ___
 
 
-## ![love y'all](screens/heart.png)  **Credits** 
+## ![love y'all](screens/heart.png)  **Credits**
 ### Assets
 * App [icon](https://www.flaticon.com/free-icon/github_23586#term=github&page=1&position=15) made by [Icomoon](https://www.flaticon.com/authors/icomoon) from [www.flaticon.com](https://www.flaticon.com/) is lecensed by [CC 3.0 BY](http://creativecommons.org/licenses/by/3.0)
 * Ads icon made by [SimpleIcon](https://www.flaticon.com/authors/simpleicon) from [www.flaticon.com](https://www.flaticon.com/) is lecensed by [CC 3.0 BY](http://creativecommons.org/licenses/by/3.0)
 * Browser's [icons](https://www.flaticon.com/packs/logo-502) made by [Pixel perfect](https://www.flaticon.com/authors/pixel-perfect) from [www.flaticon.com](https://www.flaticon.com/) is lecensed by [CC 3.0 BY](http://creativecommons.org/licenses/by/3.0)
 
+### Sponsors
+- [Curtis Conard](https://github.com/cconard96)
+- [Anastasia Anisichkina](https://github.com/anastasia-anisichkina)
+- [Ann Void](https://github.com/ann-void)
+
 ### Translation
 * [Suzana Gonçalves](https://www.facebook.com/suzana.goncalves.9041) - translation into Portuguese (Brazil)
 * [Kassandra Palma](https://www.facebook.com/kazzandra666) - translation into Spanish (Latin America and Caribbean)
@@ -80,3 +90,4 @@ ___
 * [Ryo SHIINA](https://github.com/pooch-tonic) - translation into Japanese
 * [Paweł Idzikowski](https://github.com/trolit) - translation into Polish
 * [Radoslav Mandev]([email protected]) - translation into Bulgarian
+* [Thai Nguyen](https://github.com/ntthaibk) - translation into Vietnamese

_locales/vie/messages.json

@@ -0,0 +1,89 @@
+{
+    "name": {
+        "message": "GitHub Gloc"
+    },
+    "shortName": {
+        "message": "Gloc"
+    },
+    "author": {
+        "message": "Artem Solovev"
+    },
+    "description": {
+        "message": "Đếm số dòng code trên Github"
+    },
+    "optionsTitle": {
+        "message": "Tuỳ chỉnh"
+    },
+    "github": {
+        "message": "GitHub"
+    },
+    "optionsUlDescription": {
+        "message": "Sử dụng GitHub API. Ứng dụng này sẽ gửi Yêu Cầu Chưa Được Kiểm Duyệt (Unauthenticated Request) tới GitHub API, thiết lập personal access token nếu bạn muốn:"
+    },
+    "optionsAccess": {
+        "message": "Truy cập Repository Private"
+    },
+    "optionsLimits": {
+        "message": "Bỏ qua giới hạn băng thông cho unauthenticated requests"
+    },
+    "optionsInputToken": {
+        "message": "Personal access token"
+    },
+    "optionsSaveButton": {
+        "message": "Lưu"
+    },
+    "optionsCreateToken": {
+        "message": "Tạo token"
+    },
+    "optionsTokenMustbeString": {
+        "message": "Access Token nên là 1 String ví dụ: "
+    },
+    "optionsTokenWrongLength": {
+        "message": "Sai độ dài Access Token!"
+    },
+    "optionsTokenWalid": {
+        "message": "Token khả dụng."
+    },
+    "optionsSaved": {
+        "message": "Thiết lập đã được lưu!"
+    },
+    "addToken": {
+        "message": "Bổ sung Github Token"
+    },
+    "indexWorksOnly": {
+        "message": "Chỉ chạy trên:"
+    },
+    "indexCountsFrom": {
+        "message": "Đếm số dòng code từ:"
+    },
+    "indexProjectPage": {
+        "message": "Trang thông tin chi tiết Dự Án"
+    },
+    "indexUserPage": {
+        "message": "Trang Người Dùng"
+    },
+    "indexSearchPage": {
+        "message": "Trang Kết Quả Tìm Kiếm"
+    },
+    "indexTrandingPage": {
+        "message": "Trang Xu Hướng"
+    },
+    "indexEtc": {
+        "message": "Etc."
+    },
+    "attentionPlease": {
+        "message": "Phiền bạn một chút có được không?"
+    },
+    "translateOurApp": {
+        "message": "Giúp chúng tôi dịch App này nha"
+    },
+    "totalDirLoc": {
+        "message": "Tổng dòng code trong thư mục hiện tại:"
+    },
+    "totalExtLoc": {
+        "message": "Bởi extensions:"
+    },
+    "lines": {
+        "message": "Dòng code"
+    }
+}

manifest.json

@@ -5,7 +5,7 @@
     "short_name": "__MSG_shortName__",
     "author": "__MSG_author__",
     "description": "__MSG_description__",
-    "version": "8.2.12",
+    "version": "8.2.20",
     "browser_action": {
         "default_icon": "img/icon128.png",
         "default_popup": "index.html",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gloc",
-  "version": "8.2.12",
+  "version": "8.2.20",
   "description": "Extension counts the number of lines of code in GitHub pages.",
   "author": "Artem Solovev",
   "license": "GPL-2.0",

src/modules/Popup/components/Body/Body.tsx

@@ -6,33 +6,28 @@ import {
 	Column,
 } from '../../../Common/components/Layout/index';
 import { Text } from '../../../Common/components/Text/index';
-import { TextList, Type } from '../../../Common/components/TextList/index';
+import { Header } from '../../../Common/components/Header/index';
 import { colors } from '../../../../theme/colors';
 
 export default class Body extends React.PureComponent {
 	render() {
-		const headerMsg = chrome.i18n.getMessage('indexCountsFrom');
-		const list = [
-			chrome.i18n.getMessage('indexProjectPage'),
-			chrome.i18n.getMessage('indexUserPage'),
-			chrome.i18n.getMessage('indexSearchPage'),
-			chrome.i18n.getMessage('indexTrandingPage'),
-			chrome.i18n.getMessage('indexEtc'),
-		];
+		const disclaimer = 'Github does not have a function to view the total number of '
+			+ 'lines of code in the project but we can to compute an approximation '
+			+ 'of that data (LOC: Lines of Code) through the GitHub Statistics API. '
+			+ 'Some glitches may occur, such as negative loc or "unavailable data" for many reasons';
 
 		return (
 			<Container color={colors.grey200}>
 				<Column>
 					<Row>
-						<Text>{headerMsg}</Text>
+						<Header>Disclaimer</Header>
 					</Row>
-
 					<Row>
-						<TextList
-							type={Type.Ol}
-							list={list}
-						/>
+						<Text>
+							{disclaimer}
+						</Text>
 					</Row>
+
 				</Column>
 			</Container>
 		);

src/modules/Popup/index.tsx

@@ -2,14 +2,14 @@ import * as React from 'react';
 
 import { Header } from './components/Header/index';
 import { Footer } from './components/Footer/index';
-// import { Body } from './components/Body/index';
+import { Body } from './components/Body/index';
 
 export default class PopupPage extends React.PureComponent {
 	render() {
 		return (
 			<React.Fragment>
 				<Header />
-				{/* <Body /> */}
+				<Body />
 				<Footer />
 			</React.Fragment>
 		);