initial merge

app/locales/en.json

@@ -0,0 +1,78 @@
+{
+  "Edit": "Edit",
+  "Help": "Help",
+  "Developer": "Developer",
+  "Reload": "Reload",
+  "Toggle Developer Tools": "Toggle Developer Tools",
+  "Inspect Element": "Inspect Element",
+  "connectionString": "connectionString",
+  "Method": "Method",
+  "Parameters": "Parameters",
+  "Error code": "Error code",
+  "Error message": "Error message",
+  "Error data": "Error data",
+  "Home": "Home",
+  "Publish": "Publish",
+  "This LBC remains yours and the deposit can be undone at any time.": "This LBC remains yours and the deposit can be undone at any time.",
+  "Content": "Content",
+  "What are you publishing?": "What are you publishing?",
+  "Access": "Access",
+  "Select a URL for this publish.": "Select a URL for this publish.",
+  "How much does this content cost?": "How much does this content cost?",
+  "Price": "Price",
+  "Free": "Free",
+  "Choose price...": "Choose price...",
+  "US Dollars": "US Dollars",
+  "LBRY credits": "LBRY credits",
+  "Public Domain": "Public Domain",
+  "Creative Commons Attribution 4.0 International": "Creative Commons Attribution 4.0 International",
+  "Creative Commons Attribution-ShareAlike 4.0 International": "Creative Commons Attribution-ShareAlike 4.0 International",
+  "Creative Commons Attribution-NoDerivatives 4.0 International": "Creative Commons Attribution-NoDerivatives 4.0 International",
+  "Creative Commons Attribution-NonCommercial 4.0 International": "Creative Commons Attribution-NonCommercial 4.0 International",
+  "Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International": "Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International",
+  "Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International": "Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International",
+  "Copyrighted...": "Copyrighted...",
+  "Other...": "Other...",
+  "Identity": "Identity",
+  "Who created this content?": "Who created this content?",
+  "Anonymous": "Anonymous",
+  "New identity...": "New identity...",
+  "Address": "Address",
+  "Where should this content permanently reside?": "Where should this content permanently reside?",
+  "Read more": "Read more",
+  "Terms of Service": "Terms of Service",
+  "Deposit": "Deposit",
+  "This URL is unused.": "This URL is unused.",
+  "LBRY names must contain only letters, numbers and dashes.": "LBRY names must contain only letters, numbers and dashes.",
+  "Title": "Title",
+  "Thumbnail URL": "Thumbnail URL",
+  "Description": "Description",
+  "Description of your content": "Description of your content",
+  "Language": "Language",
+  "English": "English",
+  "Chinese": "Chinese",
+  "French": "French",
+  "German": "German",
+  "Japanese": "Japanese",
+  "Russian": "Russian",
+  "Spanish": "Spanish",
+  "Maturity": "Maturity",
+  "All Ages": "All Ages",
+  "Adults Only": "Adults Only",
+  "Cancel": "Cancel",
+  "File published": "File published",
+  "I agree to the": "I agree to the",
+  "LBRY terms of service": "LBRY terms of service",
+  "Your file has been published to LBRY at the address": "Your file has been published to LBRY at the address",
+  "The file will take a few minutes to appear for other LBRY users. Until then it will be listed as \"pending\" under your published files.": "The file will take a few minutes to appear for other LBRY users. Until then it will be listed as \"pending\" under your published files.",
+  "Error publishing file": "Error publishing file",
+  "The following error occurred when attempting to publish your file": "The following error occurred when attempting to publish your file",
+  "A deposit of at least \"%s\" credit is required to win \"%s\". However, you can still get a permanent URL for any amount.": {
+    "one": "A deposit of at least \"%s\" credit is required to win \"%s\". However, you can still get a permanent URL for any amount.",
+    "other": "A deposit of at least \"%s\" credits is required to win \"%s\". However, you can still get a permanent URL for any amount."
+  },
+  "Connecting": "Connecting",
+  "Discover": "Discover",
+  "Fetching content": "Fetching content",
+  "What's this?": "What's this?"
+}

ui/js/main.js

@@ -30,6 +30,10 @@ const {remote, ipcRenderer, shell} = require('electron');
 const contextMenu = remote.require('./menu/context-menu');
 const app = require('./app')
 
+const i18n = require('y18n')({directory: 'app/locales'});
+window.__ = i18n.__;
+window.__n = i18n.__n;
+
 lbry.showMenuIfNeeded();
 
 window.addEventListener('contextmenu', (event) => {
@@ -93,7 +97,7 @@ var init = function() {
   if (window.sessionStorage.getItem('loaded') == 'y') {
     onDaemonReady();
   } else {
-    ReactDOM.render(<SplashScreen message="Connecting" onLoadDone={onDaemonReady} />, canvas);
+    ReactDOM.render(<SplashScreen message={__("Connecting")} onLoadDone={onDaemonReady} />, canvas);
   }
 };
 

ui/js/page/discover/view.jsx

@@ -5,7 +5,7 @@ import FileCard from 'component/fileCard';
 import {BusyMessage} from 'component/common.js';
 import ToolTip from 'component/tooltip.js';
 
-const communityCategoryToolTipText = ('Community Content is a public space where anyone can share content with the ' +
+const communityCategoryToolTipText = __('Community Content is a public space where anyone can share content with the ' +
   'rest of the LBRY community. Bid on the names "one," "two," "three," "four" and ' +
 '"five" to put your content here!');
 
@@ -17,7 +17,7 @@ const FeaturedCategory = (props) => {
 
   return <div className="card-row card-row--small">
     <h3 className="card-row__header">{category}
-    {category && category.match(/^community/i) && <ToolTip label="What's this?" body={communityCategoryToolTipText} className="tooltip--header" />}
+    {category && category.match(/^community/i) && <ToolTip label={__("What's this?")} body={communityCategoryToolTipText} className="tooltip--header" />}
     </h3>
     {names && names.map(name => <FileCard key={name} displayStyle="card" uri={lbryuri.normalize(name)} />)}
   </div>