Skip to content

Commit 71683d9

Browse files
hackygoluckyhackygolucky
committed
* 'master' of https://github.com/nodejs/nodejs.org: (22 commits) Add Myles as TSC Director (nodejs#1365) board: add Myles Borins (nodejs#1362) doc: fix some links in guides (nodejs#1363) blog: update 8.5.0 release blog: v8.5.0 release post (nodejs#1360) Update board.md (nodejs#1359) Merge Website WG Members and Collaborators 🎉 (nodejs#1357) Updated it translation for index.md (nodejs#1353) Get data from google doc for Announcements (nodejs#1332) fix silver section head and paypal location (nodejs#1355) layouts/in-the-news.hbs: Use JS standard style (nodejs#1352) blog: release post for v6.11.3 Change member class (nodejs#1350) Fix wrongs Language Names in Working Groups page. (nodejs#1347) Remove current gold director (nodejs#1348) Fix instruction in dockerization guide. Issue nodejs#1344 (nodejs#1346) Update TSC member list (nodejs#1343) Update site.json of zh-cn locale (nodejs#1339) Update Silver member Directors for August 2017 (nodejs#1341) blog: add release post for v8.4.0 (nodejs#1340) ...
2 parents 411b836 + 79af23c commit 71683d9

22 files changed

Lines changed: 1067 additions & 106 deletions

‎README.md‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,6 @@ content area.
6161

6262
### Website Working Group Members
6363

64-
- Frederic Hemberger ([fhemberger](https://github.com/fhemberger)): [@fhemberger](https://twitter.com/fhemberger), `mail``@``frederic-hemberger.de`
65-
- Mikeal Rogers ([mikeal](https://github.com/mikeal)): [@mikeal](https://twitter.com/mikeal), `mikeal.rogers``@``gmail.com`
66-
- Phillip Johnsen ([phillipj](https://github.com/phillipj)), `johphi``@``gmail.com`
67-
- Rod Vagg ([rvagg](https://github.com/rvagg)): [@rvagg](https://twitter.com/rvagg), `rod``@``vagg.org`
68-
69-
### Website Working Group Collaborators
70-
7164
- Yuta Hiroto ([abouthiroppy](https://github.com/abouthiroppy))
7265
- Andy Gout ([andygout](https://github.com/andygout))
7366
- Austin Winstanley ([AustinWinstanley](https://github.com/AustinWinstanley))
@@ -81,6 +74,7 @@ content area.
8174
- Evan Lucas ([evanlucas](https://github.com/evanlucas))
8275
- Fábio Santos ([fabiosantoscode](https://github.com/fabiosantoscode))
8376
- Jeremiah Senkpiel ([Fishrock123](https://github.com/Fishrock123))
77+
- Frederic Hemberger ([fhemberger](https://github.com/fhemberger))
8478
- Wyatt Preul ([geek](https://github.com/geek))
8579
- Charlie Robbins ([indexzero](https://github.com/indexzero))
8680
- Minwoo Jung ([JungMinu](https://github.com/JungMinu))
@@ -90,13 +84,16 @@ content area.
9084
- marocchino ([marocchino](https://github.com/marocchino))
9185
- Massimiliano Mura ([MassimilianoMura](https://github.com/MassimilianoMura))
9286
- Matthew Loring ([matthewloring](https://github.com/matthewloring))
87+
- Mikeal Rogers ([mikeal](https://github.com/mikeal))
9388
- Mike Dolan ([mkdolan](https://github.com/mkdolan))
9489
- Kiffie Liversage ([mrkiffie](https://github.com/mrkiffie))
9590
- Vladimir Varankin ([narqo](https://github.com/narqo))
9691
- Patrick Heneise ([PatrickHeneise](https://github.com/PatrickHeneise))
9792
- Paul Grock ([paulgrock](https://github.com/paulgrock))
93+
- Phillip Johnsen ([phillipj](https://github.com/phillipj))
9894
- rnsloan ([rnsloan](https://github.com/rnsloan))
9995
- Robert Kowalski ([robertkowalski](https://github.com/robertkowalski))
96+
- Rod Vagg ([rvagg](https://github.com/rvagg))
10097
- Seth Thompson ([s3ththompson](https://github.com/s3ththompson))
10198
- silverwind ([silverwind](https://github.com/silverwind))
10299
- Sean Ouimet ([snostorm](https://github.com/snostorm))

‎build.js‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,21 @@ function buildLocale (source, locale) {
170170
strftime: require('./scripts/helpers/strftime.js'),
171171
apidocslink: require('./scripts/helpers/apidocslink.js'),
172172
majorapidocslink: require('./scripts/helpers/majorapidocslink.js'),
173-
summary: require('./scripts/helpers/summary.js')
173+
summary: require('./scripts/helpers/summary.js'),
174+
json: function (context) {
175+
return JSON.stringify(context)
176+
},
177+
getListJson: function (context) {
178+
var result = context.map(function (item) {
179+
return {
180+
title: item.title,
181+
date: item.date,
182+
local: true,
183+
path: item.path.replace(/\\/, '/')
184+
}
185+
})
186+
return JSON.stringify(result)
187+
}
174188
}
175189
}))
176190
// Pipes the generated files into their respective subdirectory in the build

‎layouts/announcements.hbs‎

Lines changed: 64 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,77 @@
1111
{{> navigation key='foundation'}}
1212

1313
<article>
14-
<div class="container no-headline">
15-
14+
<div class="container no-headline" id="announcements-list">
1615
<ul class="news-list">
17-
{{#each collections.blogAnnounce}}
18-
{{#if title}}
19-
<li>
20-
<time datetime="{{ date }}">{{ strftime date }}</time>
21-
<a href="/{{../site.locale}}/{{ path }}/">{{ title }}</a>
22-
</li>
23-
{{/if}}
24-
{{/each}}
16+
<li>Loading data...</li>
2517
</ul>
26-
2718
</div>
2819
</article>
29-
3020
</div>
3121
</div>
22+
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/tabletop.js/1.4.2/tabletop.min.js"></script>
23+
<script type="text/javascript">
24+
var publicSpreadsheetUrl = 'https://docs.google.com/spreadsheets/d/1xwQ6ciZLADL43My_XBIWLVRuDMl8cx_omYd1FRkBZ58/pubhtml'
25+
var mdList = {{{getListJson collections.blogAnnounce}}}
26+
var siteLocal = '/{{site.locale}}/'
27+
28+
window.onload = function () {
29+
/* global Tabletop */
30+
Tabletop.init(
31+
{
32+
key: publicSpreadsheetUrl,
33+
callback: showInfo,
34+
simpleSheet: true
35+
}
36+
)
37+
38+
function pad (str) { return ('0' + str).substr(-2) }
39+
40+
function parseDate (date) {
41+
try {
42+
var parsedDate = date.split('.')
43+
return new Date('20' + parsedDate[2], parsedDate[0] - 1, parsedDate[1])
44+
} catch (_) {
45+
return date
46+
}
47+
}
48+
49+
function formatDate (date) {
50+
return date === 'Invalid Date' ? '' : date.getFullYear() + '-' + pad(date.getMonth() + 1) + '-' + pad(date.getDate())
51+
}
52+
53+
function showInfo (data, tabletop) {
54+
data.reverse()
55+
var html = ''
56+
var list = document.getElementsByClassName('news-list')
57+
var docList = []
58+
59+
data.forEach(function (row) {
60+
docList.push({
61+
path: row.Link,
62+
title: row.Title,
63+
local: false,
64+
date: parseDate(row.Date)
65+
})
66+
})
67+
68+
var allList = mdList.concat(docList)
69+
allList.sort(function (a, b) {
70+
return new Date(b.date).getTime() - new Date(a.date).getTime()
71+
})
3272
73+
allList.forEach(function (row) {
74+
if (row && row.date) {
75+
html += '<li><time datetime="' + row.date + '">' + formatDate(new Date(row.date)) + '</time>'
76+
html += '<a href="'
77+
html += (row.local) ? siteLocal + row.path : row.path
78+
html += '">' + row.title + '</a></li>'
79+
}
80+
})
81+
if (list && list[0]) list[0].innerHTML = html
82+
}
83+
}
84+
</script>
3385
{{> footer }}
3486
</body>
3587
</html>

‎layouts/in-the-news.hbs‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,50 +15,49 @@
1515
<article>
1616
<div class="container no-headline">
1717
<ul class="news-list">
18+
<li>Loading data...</li>
1819
</ul>
1920
</div>
2021
</article>
2122

2223
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/tabletop.js/1.4.2/tabletop.min.js"></script>
2324
<script type="text/javascript">
24-
var public_spreadsheet_url = 'https://docs.google.com/spreadsheets/d/1jSxgB5MYd1xCOmhb5QZ90PbDiY57n4z4A0lcdQD-UG8/pubhtml';
25-
window.onload = function () {
26-
Tabletop.init( { key: public_spreadsheet_url,
27-
callback: showInfo,
28-
simpleSheet: true } )
29-
30-
function pad(str) { return ("0"+str).substr(-2) }
31-
32-
function parseDate(date) {
25+
/* global Tabletop */
26+
var publicSpreadsheetUrl = 'https://docs.google.com/spreadsheets/d/1jSxgB5MYd1xCOmhb5QZ90PbDiY57n4z4A0lcdQD-UG8/pubhtml'
27+
window.onload = function () {
28+
Tabletop.init({
29+
key: publicSpreadsheetUrl,
30+
callback: showInfo,
31+
simpleSheet: true
32+
})
33+
function pad (str) { return ('0' + str).substr(-2) }
34+
function parseDate (date) {
3335
try {
3436
var parsedDate = date.split('.')
3537
return new Date('20' + parsedDate[2], parsedDate[0] - 1, parsedDate[1])
36-
} catch(_){
38+
} catch (_) {
3739
return date
3840
}
3941
}
40-
41-
function formatDate(date) {
42-
return date == "Invalid Date" ? '' : date.getFullYear()+'-'+pad(date.getMonth()+1)+'-'+pad(date.getDate())
42+
function formatDate (date) {
43+
return date === 'Invalid Date' ? '' : date.getFullYear() + '-' + pad(date.getMonth() + 1) + '-' + pad(date.getDate())
4344
}
44-
45-
function showInfo(data, tabletop) {
45+
function showInfo (data, tabletop) {
4646
data.reverse()
4747
var html = ''
4848
var list = document.getElementsByClassName('news-list')
49-
5049
data.forEach(function (row) {
5150
var date = parseDate(row.Date)
52-
html += '<li><time datetime="'+date+'">'+formatDate(date)+'</time><a href="'+row.Link+'">'+row.Title+'</a></li>'
51+
html += '<li><time datetime="' + date + '">' + formatDate(date) + '</time><a href="' + row.Link + '">' + row.Title + '</a></li>'
5352
})
5453
if (list && list[0]) list[0].innerHTML = html
5554
}
5655
}
57-
</script>
56+
</script>
5857

59-
</div>
6058
</div>
59+
</div>
6160

62-
{{> footer }}
63-
</body>
64-
</html>
61+
{{> footer }}
62+
</body>
63+
</html>

‎locale/en/about/working-groups.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ Note that the i18n Working Groups are distinct from the [Intl](#Intl) Working Gr
100100

101101
Each language community maintains its own membership.
102102

103-
* [nodejs-ar - Arabic (اللغة العربية)](https://github.com/nodejs/nodejs-ar)
104-
* [nodejs-bg - Bulgarian (български език)](https://github.com/nodejs/nodejs-bg)
103+
* [nodejs-ar - Arabic (العَرَبِيَّة)](https://github.com/nodejs/nodejs-ar)
104+
* [nodejs-bg - Bulgarian (български)](https://github.com/nodejs/nodejs-bg)
105105
* [nodejs-bn - Bengali (বাংলা)](https://github.com/nodejs/nodejs-bn)
106106
* [nodejs-zh-CN - Chinese (中文)](https://github.com/nodejs/nodejs-zh-CN)
107-
* [nodejs-cs - Czech (Český Jazyk)](https://github.com/nodejs/nodejs-cs)
107+
* [nodejs-cs - Czech (Čeština)](https://github.com/nodejs/nodejs-cs)
108108
* [nodejs-da - Danish (Dansk)](https://github.com/nodejs/nodejs-da)
109109
* [nodejs-de - German (Deutsch)](https://github.com/nodejs/nodejs-de)
110110
* [nodejs-el - Greek (Ελληνικά)](https://github.com/nodejs/nodejs-el)
@@ -113,15 +113,15 @@ Each language community maintains its own membership.
113113
* [nodejs-fi - Finnish (Suomi)](https://github.com/nodejs/nodejs-fi)
114114
* [nodejs-fr - French (Français)](https://github.com/nodejs/nodejs-fr)
115115
* [nodejs-he - Hebrew (עברית)](https://github.com/nodejs/nodejs-he)
116-
* [nodejs-hi - Hindi (फिजी बात)](https://github.com/nodejs/nodejs-hi)
116+
* [nodejs-hi - Hindi (हिन्दी)](https://github.com/nodejs/nodejs-hi)
117117
* [nodejs-hu - Hungarian (Magyar)](https://github.com/nodejs/nodejs-hu)
118118
* [nodejs-id - Indonesian (Bahasa Indonesia)](https://github.com/nodejs/nodejs-id)
119119
* [nodejs-it - Italian (Italiano)](https://github.com/nodejs/nodejs-it)
120120
* [nodejs-ja - Japanese (日本語)](https://github.com/nodejs/nodejs-ja)
121121
* [nodejs-ka - Georgian (ქართული)](https://github.com/nodejs/nodejs-ka)
122122
* [nodejs-ko - Korean (한국어)](https://github.com/nodejs/nodejs-ko)
123123
* [nodejs-mk - Macedonian (Македонски)](https://github.com/nodejs/nodejs-mk)
124-
* [nodejs-ms - Malay (بهاس ملايو)](https://github.com/nodejs/nodejs-ms)
124+
* [nodejs-ms - Malay (بهاس ملايو‎)](https://github.com/nodejs/nodejs-ms)
125125
* [nodejs-nl - Dutch (Nederlands)](https://github.com/nodejs/nodejs-nl)
126126
* [nodejs-no - Norwegian (Norsk)](https://github.com/nodejs/nodejs-no)
127127
* [nodejs-pl - Polish (Język Polski)](https://github.com/nodejs/nodejs-pl)
@@ -131,9 +131,9 @@ Each language community maintains its own membership.
131131
* [nodejs-sv - Swedish (Svenska)](https://github.com/nodejs/nodejs-sv)
132132
* [nodejs-ta - Tamil (தமிழ்)](https://github.com/nodejs/nodejs-ta)
133133
* [nodejs-tr - Turkish (Türkçe)](https://github.com/nodejs/nodejs-tr)
134-
* [nodejs-zh-TW - Taiwanese (Hō-ló)](https://github.com/nodejs/nodejs-zh-TW)
134+
* [nodejs-zh-TW - Taiwanese (國語)](https://github.com/nodejs/nodejs-zh-TW)
135135
* [nodejs-uk - Ukrainian (Українська)](https://github.com/nodejs/nodejs-uk)
136-
* [nodejs-vi - Vietnamese (Tiếng Việtnam)](https://github.com/nodejs/nodejs-vi)
136+
* [nodejs-vi - Vietnamese (Tiếng Việt)](https://github.com/nodejs/nodejs-vi)
137137

138138
### [Intl](https://github.com/nodejs/Intl)
139139

0 commit comments

Comments
 (0)