Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/195233
Change subject: content:targeted_takedown: Update data - Update locale - Update
data - Update tabs
......................................................................
content:targeted_takedown: Update data
- Update locale
- Update data
- Update tabs
Change-Id: I23b3f0df3e4014e7aec10bafcfc0ba5ba67a1885
---
M locales/en.yml
M source/data/targeted_takedown.csv
M source/javascripts/content.js
M source/localizable/content.html.erb
4 files changed, 47 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private
refs/changes/33/195233/1
diff --git a/locales/en.yml b/locales/en.yml
index 7073dec..e41442c 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -259,6 +259,15 @@
russian_wikipedia: "Russian Wikipedia"
slovenian_wikipedia: "Slovenian Wikipedia"
no_project_named: "No Project Named"
+ multiple: "Multiple"
+ not_a_wmf_site: "Not a WMF site"
+ korean_wikipedia: "Korean Wikipedia"
+ turkish_wikipedia: "Turkish Wikipedia"
+ hebrew_wikipedia: "Hebrew Wikipedia"
+ slovak_wikipedia: "Slovak Wikipedia"
+ korean_wikinews: "Korean Wikinews"
+ english_wikinews: "English Wikinews"
+ serbian_wikipedia: "Serbian Wikipedia"
one_case_was_american_brazilian: "One case was American-Brazillian"
one_case_was_british_swiss: "One case was British-Swiss"
diff --git a/source/data/targeted_takedown.csv
b/source/data/targeted_takedown.csv
index da08012..47db99e 100644
--- a/source/data/targeted_takedown.csv
+++ b/source/data/targeted_takedown.csv
@@ -25,4 +25,27 @@
Portuguese Wikipedia,pt.wikipedia.org,1,0,janjun14
Russian Wikipedia,ru.wikipedia.org,2,0,janjun14
Slovenian Wikipedia,sl.wikipedia.org,1,0,janjun14
-No Project Named,,3,0,janjun14
\ No newline at end of file
+No Project Named,,3,0,janjun14
+English Wikipedia,en.wikipedia.org,89,1,juldec14
+German Wikipedia,de.wikipedia.org,23,0,juldec14
+Wikimedia Commons,commons.wikimedia.org,21,0,juldec14
+French Wikipedia,fr.wikipedia.org,11,0,juldec14
+Portuguese Wikipedia,pt.wikimedia.org,6,0,juldec14
+Italian Wikipedia,it.wikipedia.org,5,0,juldec14
+Spanish Wikipedia,es.wikipedia.org,3,0,juldec14
+Dutch Wikipedia,nl.wikipedia.org,2,0,juldec14
+Korean Wikipedia,ko.wikipedia.org,2,0,juldec14
+Chinese Wikipedia,zh.wikipedia.org,1,0,juldec14
+Bulgarian Wikipedia,bg.wikipedia.org,1,0,juldec14
+English Wikinews,en.wikinews.org,1,0,juldec14
+Turkish Wikipedia,tr.wikipedia.org,1,0,juldec14
+Serbian Wikipedia,sr.wikpedia.org,1,0,juldec14
+Polish Wikipedia,pl.wikipedia.org,1,0,juldec14
+Hebrew Wikipedia,he.wikipedia.org,1,0,juldec14
+Slovak Wikipedia,sk.wikipedia.org,1,0,juldec14
+Japanese Wikipedia,ja.wikipedia.org,1,0,juldec14
+Korean Wikinews,ko.wikinews.org,1,0,juldec14
+Slovenian Wikipedia,sl.wikipedia.org,1,0,juldec14
+Multiple,,5,0,juldec14
+Not a WMF site,,4,0,juldec14
+no project named,,8,0,juldec14
diff --git a/source/javascripts/content.js b/source/javascripts/content.js
index 5fd0109..f2dfea2 100644
--- a/source/javascripts/content.js
+++ b/source/javascripts/content.js
@@ -346,7 +346,7 @@
d3.csv( '/data/targeted_takedown.csv', function ( error, data )
{
if ( error ) throw error;
- requestsAndGranted( data, 'targeted_takedown',
'juldec13' );
+ requestsAndGranted( data, 'targeted_takedown',
'juldec14' );
} );
d3.csv( '/data/targeted_dmca.csv', function ( error, data ) {
diff --git a/source/localizable/content.html.erb
b/source/localizable/content.html.erb
index d0b2384..9934f27 100644
--- a/source/localizable/content.html.erb
+++ b/source/localizable/content.html.erb
@@ -98,8 +98,9 @@
<h2><%= t('content.graph_targeted_takedown') %></h2>
<ul class="tabs">
<li><a class="targeted_takedown_tabs"
id="targeted_takedown_all" href="javascript: void(0);"><%= t('dates.all')
%></a></li>
- <li><a class="active targeted_takedown_tabs"
id="targeted_takedown_juldec13" href="javascript: void(0);"><%= t('dates.jul')
%> - <%= t('dates.dec') %> 2013</a></li>
+ <li><a class="targeted_takedown_tabs"
id="targeted_takedown_juldec13" href="javascript: void(0);"><%= t('dates.jul')
%> - <%= t('dates.dec') %> 2013</a></li>
<li><a class="targeted_takedown_tabs"
id="targeted_takedown_janjun14" href="javascript: void(0);"><%= t('dates.jan')
%> - <%= t('dates.jun') %> 2014</a></li>
+ <li><a class="active targeted_takedown_tabs"
id="targeted_takedown_juldec14" href="javascript: void(0);"><%= t('dates.jul')
%> - <%= t('dates.dec') %> 2014</a></li>
</ul>
<div class="col-md-4" id="targeted_takedown_legend">
@@ -337,6 +338,17 @@
<input type="hidden" id="t_no_project_named" value="<%=
t('graph.no_project_named') %>">
<input type="hidden" id="t_russian_wikipedia" value="<%=
t('graph.russian_wikipedia') %>">
<input type="hidden" id="t_slovenian_wikipedia" value="<%=
t('graph.slovenian_wikipedia') %>">
+<input type="hidden" id="t_multiple" value="<%= t('graph.multiple') %>">
+<input type="hidden" id="t_not_a_wmf_site" value="<%=
t('graph.not_a_wmf_site') %>">
+<input type="hidden" id="t_korean_wikipedia" value="<%=
t('graph.korean_wikipedia') %>">
+<input type="hidden" id="t_turkish_wikipedia" value="<%=
t('graph.turkish_wikipedia') %>">
+<input type="hidden" id="t_hebrew_wikipedia" value="<%=
t('graph.hebrew_wikipedia') %>">
+<input type="hidden" id="t_slovak_wikipedia" value="<%=
t('graph.slovak_wikipedia') %>">
+<input type="hidden" id="t_korean_wikinews" value="<%=
t('graph.korean_wikinews') %>">
+<input type="hidden" id="t_english_wikinews" value="<%=
t('graph.english_wikinews') %>">
+<input type="hidden" id="t_serbian_wikipedia" value="<%=
t('graph.serbian_wikipedia') %>">
+
+
<input type="hidden" id="t_one_case_was_american_brazilian" value="<%=
t('graph.one_case_was_american_brazilian') %>">
<input type="hidden" id="t_one_case_was_british_swiss" value="<%=
t('graph.one_case_was_british_swiss') %>">
--
To view, visit https://gerrit.wikimedia.org/r/195233
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I23b3f0df3e4014e7aec10bafcfc0ba5ba67a1885
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/TransparencyReport-private
Gerrit-Branch: master
Gerrit-Owner: Prtksxna <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
