MSyed has submitted this change and it was merged.
Change subject: Content Page: Add strings for the new graphs
......................................................................
Content Page: Add strings for the new graphs
Change-Id: Id578d9aeba77f6e5ea0eba79b76eb123f54d3fab
---
M locales/en.yml
M source/localizable/content.html.erb
2 files changed, 10 insertions(+), 5 deletions(-)
Approvals:
MSyed: Verified; Looks good to me, approved
diff --git a/locales/en.yml b/locales/en.yml
index 079dbed..3878841 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -80,6 +80,11 @@
s_s_obama: "<p>We received a takedown notice for a photo on <a
href='https://commons.wikimedia.org/'>Commons</a> of then-Senator <a
href='https://en.wikipedia.org/wiki/Barack_Obama'>Barack Obama’s</a> first
meeting with <a href='https://en.wikipedia.org/wiki/Nelson_Mandela'>Nelson
Mandela</a>. Because the photographer David Katz was a federal employee at the
time, the photo was believed to be in the <a
href='https://en.wikipedia.org/wiki/Copyright_status_of_work_by_the_U.S._government'>public
domain</a>. Katz argued the photo was not taken as part of his “official
duties” and thus not in the public domain. After an exhaustive factual
investigation, we could not find sufficient evidence that photography was one
of Katz’s official duties and therefore removed the image. <a
href='https://commons.wikimedia.org/wiki/Commons:Village_pump/Archive/2013/12#Update_to_Obama-Mandela_DMCA_takedown'>Read
more...</a></p>"
s_t_classic: "The Classics<br><small>November 2013</small>"
s_s_classic: "<p>A publishing company sent us a takedown request
concerning four famous works on <a
href='https://wikisource.org/'>Wikisource</a>: French translations of <a
href='https://en.wikipedia.org/wiki/Jane_Austen'>Jane Austen's</a> <a
href='http://fr.wikisource.org/wiki/Les_Cinq_Filles_de_Mrs_Bennet'><em>Pride
and Prejudice</em></a> and <a
href='http://fr.wikisource.org/wiki/Persuasion'><em>Persuasion</em></a>, a
French translation <a
href='https://en.wikipedia.org/wiki/Arthur_Conan_Doyle'>Arthur Conan
Doyle's</a> <a
href='https://fr.wikisource.org/wiki/Les_Aventures_de_Sherlock_Holmes'><em>The
Adventures of Sherlock Holmes</em></a>, and <a
href='https://en.wikipedia.org/wiki/Jean_de_la_Fontaine'>Jean de la
Fontaine’s</a> <a
href='http://fr.wikisource.org/wiki/Fables_de_La_Fontaine,_livres_I-III'><em>Fables</em></a>.
We immediately noticed the peculiarity with the request: all four original
works (and likely their French translations as well) were old enough to have
fallen into the <a href='https://en.wikipedia.org/wiki/Public_domain'>public
domain</a>. When we alerted the company to this point, it rescinded the
takedown notice.</p>"
+ graph_where_from: "Where did these requests come from?"
+ graph_targeted_takedown: "Which Wikimedia projects were targeted?"
+ graph_dmca_requests: "DMCA requests received, and how we reponded"
+ request_granted: "Request Granted?"
+ graph_targeted_dmca: "Which Wikimedia projects were targeted?"
faq:
title: "Frequently<br>Asked Questions"
diff --git a/source/localizable/content.html.erb
b/source/localizable/content.html.erb
index de9c88a..0fc67f1 100644
--- a/source/localizable/content.html.erb
+++ b/source/localizable/content.html.erb
@@ -69,7 +69,7 @@
<div class="col-md-12">
<div class="analytics">
- <h2>Where did these requests come from?</h2>
+ <h2><%= t('content.graph_where_from') %></h2>
<ul class="tabs">
<li><a class="where_from_tabs" id="where_from_all"
href="javascript: void(0);"><%= t('dates.all') %></a></li>
<li><a class="active where_from_tabs"
id="where_from_jul12jun13" href="javascript: void(0);"><%= t('dates.jul') %>
2012 - <%= t('dates.jun') %> 2013</a></li>
@@ -83,7 +83,7 @@
<div class="analytics">
- <h2>Which Wikimedia projects were targeted?</h2>
+ <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>
@@ -163,7 +163,7 @@
<div class="col-md-12">
<div class="analytics">
- <h2>DMCA requests received, and how we responded</h2>
+ <h2><%= t('content.graph_dmca_requests') %></h2>
<ul class="tabs">
<li><a class="dmca_requests_tabs"
id="dmca_requests_all" href="javascript: void(0);"><%= t('dates.all')
%></a></li>
<li><a class="active dmca_requests_tabs"
id="dmca_requests_jul12jun13" href="javascript: void(0);"><%= t('dates.jul') %>
2012 - <%= t('dates.jun') %> 2013</a></li>
@@ -172,7 +172,7 @@
</ul>
<div class="col-md-4" id="dmca_requests_legend">
- <h3>Request Granted?</h3>
+ <h3><%= t('content.request_granted') %></h3>
<div>
<p class="legend legend_yes"><%= t('yn.yess')
%></p>
<p class="legend legend_no"><%= t('yn.noo')
%></p>
@@ -187,7 +187,7 @@
</div>
<div class="analytics">
- <h2>Which Wikimedia projects were targeted?</h2>
+ <h2><%= t('content.graph_targeted_dmca') %></h2>
<ul class="tabs">
<li><a class="targeted_dmca_tabs"
id="targeted_dmca_all" href="javascript: void(0);"><%= t('dates.all')
%></a></li>
<li><a class="active targeted_dmca_tabs"
id="targeted_dmca_juldec13" href="javascript: void(0);"><%= t('dates.jul') %> -
<%= t('dates.dec') %> 2013</a></li>
--
To view, visit https://gerrit.wikimedia.org/r/151815
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id578d9aeba77f6e5ea0eba79b76eb123f54d3fab
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/TransparencyReport
Gerrit-Branch: master
Gerrit-Owner: Prtksxna <[email protected]>
Gerrit-Reviewer: MSyed <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
