diff --git a/js/components/ascribe_buttons/unconsign_request_button.js b/js/components/ascribe_buttons/unconsign_request_button.js index c324ff28..b6bec164 100644 --- a/js/components/ascribe_buttons/unconsign_request_button.js +++ b/js/components/ascribe_buttons/unconsign_request_button.js @@ -25,11 +25,11 @@ let UnConsignRequestButton = React.createClass({ - REQUEST UNCONSIGN + {getLangText('REQUEST UNCONSIGN')} } handleSuccess={handleSuccess} - title='Request to Un-Consign'> + title={getLangText('Request to Un-Consign')}> {return {'bitcoin_id': edition.bitcoin_id}; }} diff --git a/js/components/ascribe_detail/further_details.js b/js/components/ascribe_detail/further_details.js index b1d9c637..69b605bc 100644 --- a/js/components/ascribe_detail/further_details.js +++ b/js/components/ascribe_detail/further_details.js @@ -65,7 +65,7 @@ let FurtherDetails = React.createClass({ - CANCEL + {getLangText('CANCEL')}

diff --git a/js/components/ascribe_forms/form_send_contract_agreement.js b/js/components/ascribe_forms/form_send_contract_agreement.js index 00a69e18..2fa66b71 100644 --- a/js/components/ascribe_forms/form_send_contract_agreement.js +++ b/js/components/ascribe_forms/form_send_contract_agreement.js @@ -54,8 +54,7 @@ let SendContractAgreementForm = React.createClass({ }, handleSubmitSuccess() { - let notification = 'Contract agreement sent'; - notification = new GlobalNotificationModel(notification, 'success', 10000); + const notification = new GlobalNotificationModel(getLangText('Contract agreement sent'), 'success', 10000); GlobalNotificationActions.appendGlobalNotification(notification); this.history.push('/collection'); @@ -89,13 +88,14 @@ let SendContractAgreementForm = React.createClass({ ); })} - ); + + ); } return null; }, render() { - if (this.state.contractList && this.state.contractList.length > 0) { + if (this.state.contractList && this.state.contractList.length) { return (
); - } - return ( -
+ } else { + return (

{getLangText('No contracts uploaded yet, please go to the ')} {getLangText('contract settings page')} {getLangText(' and create them.')}

-
- ); + ); + } } }); diff --git a/js/components/ascribe_forms/form_share_email.js b/js/components/ascribe_forms/form_share_email.js index 920df0da..39cf5ac7 100644 --- a/js/components/ascribe_forms/form_share_email.js +++ b/js/components/ascribe_forms/form_share_email.js @@ -43,7 +43,7 @@ let ShareForm = React.createClass({

} diff --git a/js/components/ascribe_settings/api_settings.js b/js/components/ascribe_settings/api_settings.js index ed35041b..3acaa7bb 100644 --- a/js/components/ascribe_settings/api_settings.js +++ b/js/components/ascribe_settings/api_settings.js @@ -57,7 +57,7 @@ let APISettings = React.createClass({ }, getApplications(){ - let content = ; + let content = ; if (this.state.applications.length > -1) { content = this.state.applications.map(function(app, i) { @@ -92,7 +92,7 @@ let APISettings = React.createClass({ } return content; }, - + render() { return ( + required />
-                    Usage: curl <url> -H 'Authorization: Bearer <token>'
+                    {getLangText('Usage:')} curl <url> -H 'Authorization: Bearer <token>'
                 
{this.getApplications()}
@@ -120,4 +120,4 @@ let APISettings = React.createClass({ } }); -export default APISettings; \ No newline at end of file +export default APISettings; diff --git a/js/components/ascribe_settings/webhook_settings.js b/js/components/ascribe_settings/webhook_settings.js index ab6f888a..1de87d45 100644 --- a/js/components/ascribe_settings/webhook_settings.js +++ b/js/components/ascribe_settings/webhook_settings.js @@ -131,13 +131,13 @@ let WebhookSettings = React.createClass({ defaultExpanded={this.props.defaultExpanded}>

- Webhooks allow external services to receive notifications from ascribe. - Currently we support webhook notifications when someone transfers, consigns, loans or shares - (by email) a work to you. + {getLangText('Webhooks allow external services to receive notifications from ascribe. ' + + 'Currently we support webhook notifications when someone transfers, consigns, ' + + 'loans or shares (by email) a work to you.')}

- To get started, simply choose the prefered action that you want to be notified upon and supply - a target url. + {getLangText('To get started, simply choose the prefered action that you want to be ' + + 'notified upon and supply a target url.')}

0}> diff --git a/js/components/password_reset_container.js b/js/components/password_reset_container.js index 773e1a63..cc8be9af 100644 --- a/js/components/password_reset_container.js +++ b/js/components/password_reset_container.js @@ -126,7 +126,7 @@ let PasswordResetForm = React.createClass({ handleSuccess() { this.history.push('/collection'); - const notification = new GlobalNotificationModel(getLangText('password successfully updated'), 'success', 10000); + const notification = new GlobalNotificationModel(getLangText('Password successfully updated'), 'success', 10000); GlobalNotificationActions.appendGlobalNotification(notification); }, diff --git a/js/components/whitelabel/prize/prize_routes.js b/js/components/whitelabel/prize/prize_routes.js index 8d380222..79b64f29 100644 --- a/js/components/whitelabel/prize/prize_routes.js +++ b/js/components/whitelabel/prize/prize_routes.js @@ -3,6 +3,17 @@ import React from 'react'; import { Route, IndexRoute } from 'react-router'; +import { ProxyHandler, AuthRedirect } from '../../../components/ascribe_routes/proxy_handler'; +import { AuthPrizeRoleRedirect } from './portfolioreview/components/pr_routes/pr_proxy_handler'; + +// General components +import EditionContainer from '../../ascribe_detail/edition_container'; +import LogoutContainer from '../../logout_container'; +import PasswordResetContainer from '../../password_reset_container'; +import CoaVerifyContainer from '../../coa_verify_container'; +import ErrorNotFoundPage from '../../error_not_found_page'; + +import SPApp from './simple_prize/prize_app'; import SPLanding from './simple_prize/components/prize_landing'; import SPLoginContainer from './simple_prize/components/prize_login_container'; import SPSignupContainer from './simple_prize/components/prize_signup_container'; @@ -10,7 +21,6 @@ import SPRegisterPiece from './simple_prize/components/prize_register_piece'; import SPPieceList from './simple_prize/components/prize_piece_list'; import SPPieceContainer from './simple_prize/components/ascribe_detail/prize_piece_container'; import SPSettingsContainer from './simple_prize/components/prize_settings_container'; -import SPApp from './simple_prize/prize_app'; import SluicePieceContainer from './sluice/components/sluice_detail/sluice_piece_container'; @@ -18,14 +28,7 @@ import PRApp from './portfolioreview/pr_app'; import PRLanding from './portfolioreview/components/pr_landing'; import PRRegisterPiece from './portfolioreview/components/pr_register_piece'; -import EditionContainer from '../../ascribe_detail/edition_container'; -import LogoutContainer from '../../logout_container'; -import PasswordResetContainer from '../../password_reset_container'; -import CoaVerifyContainer from '../../coa_verify_container'; -import ErrorNotFoundPage from '../../error_not_found_page'; - -import { ProxyHandler, AuthRedirect } from '../../../components/ascribe_routes/proxy_handler'; -import { AuthPrizeRoleRedirect } from './portfolioreview/components/pr_routes/pr_proxy_handler'; +import { getLangText } from '../../../utils/lang_utils'; const ROUTES = { @@ -57,12 +60,12 @@ const ROUTES = {
@@ -411,12 +413,12 @@ let ROUTES = { diff --git a/js/routes.js b/js/routes.js index d7a1d0c4..cc76cb3a 100644 --- a/js/routes.js +++ b/js/routes.js @@ -27,6 +27,8 @@ import RegisterPiece from './components/register_piece'; import { ProxyHandler, AuthRedirect } from './components/ascribe_routes/proxy_handler'; +import { getLangText } from './utils/lang_utils'; + const COMMON_ROUTES = ( @@ -36,11 +38,11 @@ const COMMON_ROUTES = ( + headerTitle={getLangText('+ NEW WORK')} />