Multi-language and French #344

nikkozzblu · 2017-02-06T12:24:48Z

Not ready for production,

Having some problems with the panel-left new styles (Css not being updated ?!). Also notice wind/solar icons and scale not being displayed.

try it on http://localhost:8000/?lang=fr

You mainly find 2 files by language extension:
/locales/$lang.json
which contain the static translations (processed server side)

/app/config/lang.json
which contains the translations of the label that are filled dynamically on JS, append new language here

Update FR for consistency

corradio · 2017-02-06T12:31:15Z

I'm renaming to WIP - .... to make it clear it's not ready for review

nikkozzblu · 2017-02-06T17:02:44Z

OK now should be compiling, I don't want to spend too much time on integrating latest changes like time series since it seems that it is changing fast in the coming days,...

Hope the latest merging were correct
Feel free to review when you get a chance

corradio · 2017-02-06T19:29:26Z

Thanks! I'll review asap but we will need to merge master anyway..
There's no major changes upcoming so this will be the last one.

corradio

Pretty cool!
The merge will be needed sorry.. If I had known I would have waited :(
I suggest:
1/ fix the indentations to have a clean diff
2/ do a merge master

corradio · 2017-02-06T19:33:25Z

web/app/countrytable.js

@@ -33,6 +33,9 @@ function CountryTable(selector, co2Color, modeColor, modeOrder) {
    this.SCALE_TICKS = 4;
    this.TRANSITION_DURATION = 250;

+
+    this.LANG = lang;
+console.log('a',this.LANG);


corradio · 2017-02-06T19:33:35Z

web/app/countrytable.js

@@ -368,7 +371,7 @@ CountryTable.prototype.resize = function() {

 CountryTable.prototype.data = function(arg) {
    var that = this;
-
+	console.log(this._data);


corradio · 2017-02-06T19:36:21Z

web/views/pages/index.ejs

-                <div class="country-picker-container small-screen-visible" style="margin-left: 20px">
+
+            <div class="country-table-initial-text">
+                    <p class="small-screen-visible" style="font-style: italic">


Additional indentation creates a lot of diff

corradio · 2017-02-06T19:36:34Z

web/views/pages/index.ejs

                        <svg class="co2-colorbar colorbar" style="width: 100%"></svg>
                    </p>
-                    <p>
+          					<p>


Indent problem

corradio · 2017-02-06T19:37:46Z

web/app/main.js

@@ -35,8 +36,10 @@ var selectedCountryCode;
 var forceRemoteEndpoint = false;
 var customDate;
 var timelineEnabled = false;
+var reqLang = 'en';


how is the language changed except by querystring argument? Shouldn't it be detected automatically? Maybe you can use ~L134 where we set the moment locale?

// Set proper locale var locale = window.navigator.userLanguage || window.navigator.language; moment.locale(locale);

The translation is a mix of server (through i18n) and client, so far i had no luck to get the server understanding same locale as client but i ll have another try since it shoudl be the defaut behaviour of the i18n library. As matter of consistency i therefore also use the query string on client.

ok can you then also update the locale used by moment for consistency? Should be around L134.

Yes it was what I did originally but because my french locale was not understood by server.js, it results in some mix between English text/French "source names"...
the server should be able to understand fr from i18n spec, not sure what is going wrong here.
Anyway I thought the query string could be a good intermediate solution for first release before we get the text actually read and corrected by external reviewer

# Conflicts: # web/app/countrytable.js # web/app/main.js # web/views/pages/index.ejs

corradio · 2017-02-07T09:41:13Z

@nikkozzblu please let me know when to review!

nikkozzblu · 2017-02-07T09:44:15Z

Should be alright now, (hope so, I was almost able to run a stable development environment but just lost my VM connection as I change Wi-Fi network... :()

nikkozzblu · 2017-02-07T09:44:31Z

Should be alright now, (hope so, I was almost able to run a stable development environment but just lost my VM connection as I change Wi-Fi network... :()

corradio

Almost there.

We need to support i10n for data shared on Facebook too. See https://developers.facebook.com/docs/opengraph/guides/internationalization

On the / route, set locale based on the fb_locale query string (values received comply to https://developers.facebook.com/docs/internationalization/#locales). We should also add a locale or lang querystring for ourselves.
For each language supported, add a meta property <meta property="og:locale:alternate" content="es_ES" />
For the current language used, set <meta property="og:locale" content="en_US" />

I'll also verify all translations.

corradio · 2017-02-07T09:49:29Z

web/public/css/styles.css

@@ -275,4 +275,4 @@ div.fb-share-button, div.fb-like, div.fb-follow, iframe.twitter-share-button, if

 .time-travel {
    display: none;
-}
+}


This file shouldn't change

corradio · 2017-02-07T09:49:42Z

web/server.js

+//multi-language
+i18n.configure({
+    // where to store json files - defaults to './locales' relative to modules directory
+    locales:['en', 'fr'],


Style: Missing space after :

corradio · 2017-02-07T09:50:32Z

web/views/pages/index.ejs

@@ -112,8 +110,8 @@
                    <input type="text" class="flatpickr" />
                </div>
            </div>
-            <p>
-                <span id="country-table-back-button" style="display: none"><a><< back</a></span>
+			<p>


Style: Indentation

corradio · 2017-02-07T09:50:50Z

web/views/pages/index.ejs

                        <svg class="co2-colorbar colorbar" style="width: 100%"></svg>
                    </p>
-                    <p>


Style: indentation

corradio · 2017-02-07T09:51:14Z

web/views/pages/index.ejs

                        <svg class="solar-colorbar colorbar" style="width: 100%; display:none"></svg>
                    </p>
                </div>
            </div>
            <div>
                <hr />
-                Found bugs or have ideas? Report them <a href="https://github.com/corradio/electricitymap/issues/new" target="_blank">here</a>.<br />


Style: indentation. Also seems like order of two lines has been changed.

corradio · 2017-02-07T09:52:09Z

web/app/main.js

 var currentMoment;

+


Extra line not needed

corradio · 2017-02-07T09:52:46Z

web/app/main.js

@@ -82,6 +85,8 @@ args.forEach(function(arg) {
    } else if (kv[0] == 'countryCode') {
        selectedCountryCode = kv[1];
        replaceHistoryState('countryCode', selectedCountryCode);
+    } else if(kv[0] == 'lang'){
+		reqLang = kv[1];


Style: indent

corradio · 2017-02-07T09:55:48Z

web/app/main.js

@@ -82,6 +85,8 @@ args.forEach(function(arg) {
    } else if (kv[0] == 'countryCode') {
        selectedCountryCode = kv[1];
        replaceHistoryState('countryCode', selectedCountryCode);
+    } else if(kv[0] == 'lang'){


I'm actually not in favor of using a querystring argument because the URL is used when sharing to social media (and we don't want to url to be part of that).
I suggest instead that the node server adds a global variable to the template, thus defining the locale.
Then you don't need to read it here.

corradio · 2017-02-07T09:56:13Z

web/app/tooltip.js

@@ -15,7 +15,7 @@ function getConsumption(country) {
 }

 // ** Country table
-exports.setupCountryTable = function (countryTable, countries, co2Colorbar, co2color) {
+exports.setupCountryTable = function (countryTable, countries, co2Colorbar, co2color,lang) {


Style: missing space after ,

corradio · 2017-02-07T09:56:41Z

web/package.json

@@ -17,7 +17,8 @@
    "mongodb": "^2.2.9",
    "opbeat": "^3.21.0",
    "snappy": "^5.0.5",
-    "topojson": "^2.2.0"
+    "topojson": "^2.2.0",
+  	"i18n":"^0.8.3"


Style: Indentation error

corradio · 2017-02-07T10:32:03Z

Btw I added a section for global variables coming from the server:
a0a35ef#diff-a344ab15f45451bd3fe93462dc8325d1R29

…sing labels,

nikkozzblu added 26 commits January 18, 2017 17:20

Fetch price to DB

b43f864

Price from ENTSOE

627457a

Update FR for consistency

Styling and not importing future prices

fc4430b

Merge branch 'master' into master

deb9f8a

Merge branch 'master' of https://github.com/nikkozzblu/electricitymap

2d5659f

Last point if no date specify

16b853f

Merge branch 'master' into master

e54699f

BUG position

e1ede10

Merge branch 'master' of https://github.com/nikkozzblu/electricitymap

c52f13a

alphaorder

c944573

Merge branch 'master' into master

ad33062

Solar speed

df76105

Merge branch 'master' into master

5af9403

index and rounding (fix a 0.5deg shift)

b8d463b

Merge branch 'master' into master

4976d02

Merge branch 'master' of https://github.com/nikkozzblu/electricitymap

e51e675

Styling and warning

bc56c68

Optimize rounding and comments

ce1eec5

Merge branch 'master' into master

00f7c02

Continuous scale replace levels

398492d

legend, formatting filter

5ae3c8d

forgot those 2

e917d1a

Merge remote-tracking branch 'refs/remotes/corradio/master'

5846dfd

Merge lang from local to updated branch

f7f1dd9

Fix rejected updates

4a4b7b9

fossil fuels

d849530

corradio changed the title ~~Multi-language and French~~ WIP - Multi-language and French Feb 6, 2017

nikkozzblu added 2 commits February 6, 2017 17:33

Style and language correction

669e55f

Missing bracket

51de788

Merge branch 'master' into master

8942fae

nikkozzblu changed the title ~~WIP - Multi-language and French~~ Multi-language and French Feb 6, 2017

corradio self-requested a review February 6, 2017 19:28

corradio self-assigned this Feb 6, 2017

corradio requested changes Feb 6, 2017

View reviewed changes

corradio mentioned this pull request Feb 6, 2017

Translation #311

Closed

nikkozzblu added 5 commits February 7, 2017 09:18

Indentations fix

e799aec

Merge branch 'master' into master

3d31c99

remove loggings

4bea4b4

Merge remote-tracking branch 'origin/master'

03046ed

# Conflicts: # web/app/countrytable.js # web/app/main.js # web/views/pages/index.ejs

Merge branch 'master' into master

8d1cfa5

Merge branch 'master' into master

768adf3

corradio requested changes Feb 7, 2017

View reviewed changes

nikkozzblu added 3 commits February 7, 2017 12:52

auto-redirect to your language,Correct indentation, adding latest mis…

c2ab9dd

…sing labels,

Merge branch 'master' of https://github.com/nikkozzblu/electricitymap

ca60203

Merge branch 'master' into master

7826433

nikkozzblu closed this Feb 7, 2017

corradio pushed a commit that referenced this pull request Feb 7, 2017

Initial branching from #344 (#349)

50d21e1

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Multi-language and French #344

Multi-language and French #344

nikkozzblu commented Feb 6, 2017

corradio commented Feb 6, 2017

nikkozzblu commented Feb 6, 2017

corradio commented Feb 6, 2017

corradio left a comment

corradio Feb 6, 2017

corradio Feb 6, 2017

corradio Feb 6, 2017

corradio Feb 6, 2017

corradio Feb 6, 2017

nikkozzblu Feb 6, 2017

corradio Feb 7, 2017

nikkozzblu Feb 7, 2017

corradio commented Feb 7, 2017

nikkozzblu commented Feb 7, 2017

nikkozzblu commented Feb 7, 2017

corradio left a comment •

edited

Loading

corradio Feb 7, 2017

corradio Feb 7, 2017

corradio Feb 7, 2017

corradio Feb 7, 2017

corradio Feb 7, 2017

corradio Feb 7, 2017

corradio Feb 7, 2017

corradio Feb 7, 2017

corradio Feb 7, 2017

corradio Feb 7, 2017

corradio commented Feb 7, 2017

Multi-language and French #344

Multi-language and French #344

Conversation

nikkozzblu commented Feb 6, 2017

corradio commented Feb 6, 2017

nikkozzblu commented Feb 6, 2017

corradio commented Feb 6, 2017

corradio left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

corradio commented Feb 7, 2017

nikkozzblu commented Feb 7, 2017

nikkozzblu commented Feb 7, 2017

corradio left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

corradio commented Feb 7, 2017

corradio left a comment •

edited

Loading