Merge pull request #150 from sergioruizdavila/feature/Translate_text_…

…to_English_#148 Feature/translate text to english #148
serudda · Jan 19, 2017 · abcae54 · abcae54
2 parents a2b36ec + d1d49fe
commit abcae54
Show file tree

Hide file tree

Showing 11 changed files with 196 additions and 126 deletions.
diff --git a/www/app/app.values.js b/www/app/app.values.js
diff --git a/www/app/app.values.js.map b/www/app/app.values.js.map
diff --git a/www/app/app.values.ts b/www/app/app.values.ts
@@ -44,7 +44,7 @@ interface IDataConfig {
     // bucketS3: 'waysily-img/teachers-avatar-prd'
     var dataConfig: IDataConfig = {
         currentYear: '2017',
-        baseUrl: 'https://waysily-server-dev.herokuapp.com/api/v1/',
+        baseUrl: 'https://waysily-server.herokuapp.com/api/v1/',
         googleMapKey: 'AIzaSyD-vO1--MMK-XmQurzNQrxW4zauddCJh5Y',
         mixpanelToken: '86a48c88274599c662ad64edb74b12da',
         modalMeetingPointTmpl: 'components/modal/modalMeetingPoint/modalMeetingPoint.html',
@@ -53,7 +53,7 @@ interface IDataConfig {
         modalEducationTmpl: 'components/modal/modalEducation/modalEducation.html',
         modalCertificateTmpl: 'components/modal/modalCertificate/modalCertificate.html',
         modalSignUpTmpl: 'components/modal/modalSignUp/modalSignUp.html',
-        bucketS3: 'waysily-img/teachers-avatar-dev',
+        bucketS3: 'waysily-img/teachers-avatar-prd',
         regionS3: 'us-east-1',
         accessKeyIdS3: 'AKIAIHKBYIUQD4KBIRLQ',
         secretAccessKeyS3: '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',

diff --git a/www/assets/i18n/en.json b/www/assets/i18n/en.json
diff --git a/www/assets/i18n/es.json b/www/assets/i18n/es.json
diff --git a/www/build/js/app.js b/www/build/js/app.js
diff --git a/www/components/header/header.directive.js b/www/components/header/header.directive.js
diff --git a/www/components/header/header.directive.js.map b/www/components/header/header.directive.js.map
diff --git a/www/components/header/header.directive.ts b/www/components/header/header.directive.ts
@@ -125,7 +125,7 @@ module components.header {
             //Init form
             this.form = {
                 language: this.functionsUtil.getCurrentLanguage() || 'en',
-                whereTo: 'Where to?'
+                whereTo: this.$filter('translate')('%header.search.placeholder.text')
             };
 
             this._slideout = false;

diff --git a/www/components/header/header.html b/www/components/header/header.html
@@ -35,8 +35,8 @@
                         search
                     </i>
                     <label class="screen-reader-only"
-                           for="header-search-form" aria-hidden="true">
-                        Where to?
+                           for="header-search-form" aria-hidden="true" translate>
+                        %header.search.placeholder.text
                     </label>
                     <input type="text"
                            class="ma-header__block__search-wrapper__form__search-bar__input"
@@ -406,17 +406,17 @@
                     <a class="ma-dropdown__option__btn disabled"
                        href>
                         Guatemala
-                        <span class="ma-p ma-p--default pull-right">
-                            Coming soon
+                        <span class="ma-p ma-p--default pull-right" translate>
+                            %global.coming_soon.text
                         </span>
                     </a>
                 </li>
                 <li class="ma-dropdown__option">
                     <a class="ma-dropdown__option__btn disabled"
                        href>
                         Mexico
-                        <span class="ma-p ma-p--default pull-right">
-                            Coming soon
+                        <span class="ma-p ma-p--default pull-right" translate>
+                            %global.coming_soon.text
                         </span>
                     </a>
                 </li>

diff --git a/www/components/modal/modalExperience/modalExperience.html b/www/components/modal/modalExperience/modalExperience.html
@@ -31,6 +31,7 @@ <h4 class="ma-box__title margin-reset">
                 <label for="position-experience-input" translate>
                     %modal.experience.form.position.text
                 </label>
+                <!-- TODO: Remover el placeholder quemado en este input -->
                 <input id="position-experience-input" type="text"
                         class="ma-input
                                 ma-input--large"
@@ -49,6 +50,7 @@ <h4 class="ma-box__title margin-reset">
                 <label for="company-experience-input" translate>
                     %modal.experience.form.company.text
                 </label>
+                <!-- TODO: Remover el placeholder quemado en este input -->
                 <input id="company-experience-input" type="text"
                         class="ma-input
                                 ma-input--large"