Merge pull request #70 from muffinresearch/add-stub-gettext

Add stub gettext

bin/server.js

@@ -5,10 +5,10 @@
 
 require('../server.babel');
 
-const config = require('../config').default;
+const config = require('config').default;
 const appName = config.get('currentApp');
 
-const server = require(`../src/${appName}/server`).default;
+const server = require(`${appName}/server`).default;
 
 const env = config.get('env');
 

karma.conf.js

@@ -1,4 +1,4 @@
 // This allows the karma conf to use ES6.
 require('./server.babel');
 
-module.exports = exports = require('./config/karma.config').default;
+module.exports = exports = require('./src/config/karma.config').default;

package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "private": true,
   "scripts": {
-    "start": "npm run version-check && NODE_PATH=$NODE_PATH:. node bin/server.js",
+    "start": "npm run version-check && NODE_PATH=$NODE_PATH:./src node bin/server.js",
     "dev": "NODE_ENV=development npm run start",
     "dev:search": "APP_NAME=search npm run dev",
     "dev:disco": "APP_NAME=disco npm run dev",

config/webpack.config.js → src/config/webpack.config.js

@@ -36,6 +36,9 @@ export default {
     }),
   ],
   resolve: {
+    root: [
+      path.resolve('../src'),
+    ],
     modulesDirectories: ['node_modules', 'src'],
     extensions: ['', '.js', '.jsx'],
   },

src/core/utils.js

@@ -0,0 +1,3 @@
+export function gettext(str) {
+  return str;
+}

src/disco/components/hello-world.js

@@ -1,10 +1,13 @@
 import React from 'react';
 
+import { gettext as _ } from 'core/utils';
+
+
 export default class AppView extends React.Component {
   render() {
     return (
       <div id="app-view">
-        <h1>HELLO DISCO WORLD</h1>
+        <h1>{_('HELLO DISCO WORLD')}</h1>
       </div>
     );
   }

src/search/components/App.js

@@ -2,6 +2,7 @@ import React from 'react';
 
 import SearchForm from './SearchForm';
 import SearchResults from './SearchResults';
+import { gettext as _ } from 'core/utils';
 
 export default class App extends React.Component {
 
@@ -19,7 +20,7 @@ export default class App extends React.Component {
     const { query, results } = this.state;
     return (
       <div className="search-app">
-        <h1>Add-on Search</h1>
+        <h1>{_('Add-on Search')}</h1>
         <SearchForm onSearch={this.handleSearch} />
         <SearchResults results={results} query={query} />
       </div>

src/search/components/SearchForm.js

@@ -1,5 +1,8 @@
 import React, { PropTypes } from 'react';
 
+import { gettext as _ } from 'core/utils';
+
+
 export default class SearchForm extends React.Component {
   static propTypes = {
     onSearch: PropTypes.func.isRequired,
@@ -13,8 +16,8 @@ export default class SearchForm extends React.Component {
   render() {
     return (
       <form ref="form" className="search-form" onSubmit={this.handleSubmit}>
-        <input ref="query" type="search" name="q" placeholder="Search" />
-        <button ref="submit" type="submit">Search</button>
+        <input ref="query" type="search" name="q" placeholder={_('Search')} />
+        <button ref="submit" type="submit">{_('Search')}</button>
       </form>
     );
   }

src/search/components/SearchResults.js

@@ -1,5 +1,8 @@
 import React, { PropTypes } from 'react';
 
+import { gettext as _ } from 'core/utils';
+
+
 export default class SearchResults extends React.Component {
   static propTypes = {
     query: PropTypes.string,
@@ -18,16 +21,16 @@ export default class SearchResults extends React.Component {
     let messageText;
 
     if (query && results.length > 0) {
-      messageText = `Your search for "${query}" returned ${results.length} results.`;
+      messageText = _(`Your search for "${query}" returned ${results.length} results.`);
       searchResults = (
         <ul ref="results">
           {results.map((result) => <li key={result.title}>{result.title}</li>)}
         </ul>
       );
     } else if (query && results.length === 0) {
-      messageText = `No results were found for "${query}".`;
+      messageText = _(`No results were found for "${query}".`);
     } else if (query !== null) {
-      messageText = 'Please supply a valid search';
+      messageText = _('Please supply a valid search');
     }
 
     const message = messageText ? <p ref="message">{messageText}</p> : null;

webpack.config.js

@@ -1,4 +1,4 @@
 // This allows the webpack conf to use ES6.
 require('./server.babel');
 
-module.exports = exports = require('./config/webpack.config');
+module.exports = exports = require('./src/config/webpack.config');