Merge branch 'master' into 2687-remove-own-username-from-transfer

prcolaco · Apr 12, 2018 · d6be382 · d6be382
2 parents 0b57457 + 9b1b32d
commit d6be382
Show file tree

Hide file tree

Showing 7 changed files with 691 additions and 2 deletions.
diff --git a/src/app/Main.js b/src/app/Main.js
@@ -116,6 +116,7 @@ if (!window.Intl) {
             require('intl/locale-data/jsonp/fr.js');
             require('intl/locale-data/jsonp/it.js');
             require('intl/locale-data/jsonp/ko.js');
+            require('intl/locale-data/jsonp/ja.js');
             Iso.bootstrap(runApp);
         },
         'IntlBundle'

diff --git a/src/app/Translator.js b/src/app/Translator.js
@@ -9,10 +9,11 @@ import it from 'react-intl/locale-data/it';
 import ko from 'react-intl/locale-data/ko';
 import zh from 'react-intl/locale-data/zh';
 import pl from 'react-intl/locale-data/pl';
+import ja from 'react-intl/locale-data/ja';
 import { DEFAULT_LANGUAGE } from 'app/client_config';
 import tt from 'counterpart';
 
-addLocaleData([...en, ...es, ...ru, ...fr, ...it, ...ko, ...zh, ...pl]);
+addLocaleData([...en, ...es, ...ru, ...fr, ...it, ...ko, ...zh, ...pl, ...ja]);
 
 tt.registerTranslations('en', require('counterpart/locales/en'));
 tt.registerTranslations('en', require('app/locales/en.json'));
@@ -38,6 +39,9 @@ tt.registerTranslations('zh', require('app/locales/zh.json'));
 tt.registerTranslations('pl', require('app/locales/counterpart/pl'));
 tt.registerTranslations('pl', require('app/locales/pl.json'));
 
+tt.registerTranslations('ja', require('app/locales/counterpart/ja'));
+tt.registerTranslations('ja', require('app/locales/ja.json'));
+
 if (process.env.NODE_ENV === 'production') {
     tt.setFallbackLocale('en');
 }

diff --git a/src/app/components/modules/SidePanel/index.jsx b/src/app/components/modules/SidePanel/index.jsx
@@ -85,7 +85,7 @@ const SidePanel = ({ alignment, visible, hideSidePanel, username }) => {
             {
                 value: 'gopax',
                 label: 'GOPAX',
-                link: 'https://www.gopax.co.kr/exchange?market=STEEM/KRW',
+                link: 'https://www.gopax.co.kr/exchange/steem-krw/',
             },
         ],
         external: [

diff --git a/src/app/locales/counterpart/ja.js b/src/app/locales/counterpart/ja.js
@@ -0,0 +1,30 @@
+// The translations in this file are added by default.
+
+'use strict';
+
+module.exports = {
+    counterpart: {
+        names: require('date-names/en'),
+        pluralize: require('pluralizers/en'),
+
+        formats: {
+            date: {
+                'default':  '%a, %e %b %Y',
+                long:       '%A, %B %o, %Y',
+                short:      '%e %b'
+            },
+
+            time: {
+                'default':  '%H:%M',
+                long:       '%H:%M:%S %z',
+                short:      '%H:%M'
+            },
+
+            datetime: {
+                'default':  '%a, %e %b %Y %H:%M',
+                long:       '%A, %B %o, %Y %H:%M:%S %z',
+                short:      '%e %b %H:%M'
+            }
+        }
+    }
+};
diff --git a/src/app/locales/ja.json b/src/app/locales/ja.json
diff --git a/src/app/utils/DMCAList.js b/src/app/utils/DMCAList.js
@@ -54,6 +54,7 @@ export default `
 /gaming/@braini/yakuza-6-the-song-of-life-review-on-fire
 /gaming/@braini/assassin-s-creed-origins-curse-of-the-pharaohs-review-a-wonderful-history-lesson
 /flstudio/@cracked-games/ltxziiz9
+/music/@jneelocamacho/how-to-download-free-fl-studio-mobile
 `
     .trim()
     .split('\n');
diff --git a/src/app/utils/DMCAUserList.js b/src/app/utils/DMCAUserList.js
@@ -3,6 +3,7 @@ spaces
 the-gaming-llama
 cmgsteems
 iamgod
+cracked-games
 `
     .trim()
     .split('\n');