MSyed has uploaded a new change for review. https://gerrit.wikimedia.org/r/151586
Change subject: Added links and fixed typos ...................................................................... Added links and fixed typos Change-Id: I566eb1f510144ea0e24f9d4d8c5ec03e92849a4e --- M locales/en.yml M source/layouts/layout.erb M source/localizable/content.html.erb M source/localizable/index.html.erb M source/localizable/privacy.html.erb 5 files changed, 18 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport refs/changes/86/151586/1 diff --git a/locales/en.yml b/locales/en.yml index 399979c..e8901de 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -30,15 +30,15 @@ privacy: title: "Requests for<br/>User Data" total_number_of_requests: "Total Number of Requests" - percentage_of_times_information_produced: "Percentage of Time Information Produced" + percentage_of_times_information_produced: "Percentage of Times Information Produced" lead: "<a href='https://meta.wikimedia.org/wiki/Wikimedia_Foundation_Guiding_Principles#Free_speech'>Freedom of speech is essential</a> to the Wikimedia movement—our projects cannot flourish in an ecosystem where individuals cannot speak freely. Our users trust us to protect their identities against unlawful disclosure and we take this responsibility seriously." - intro: "<p>However, every year, governments, individuals, and corporations ask us to disclose user data. Often, we have no nonpublic information to disclose because we <a href='https://wikimediafoundation.org/wiki/Privacy_policy#Types_of_Information_We_Receive_From_You.2C_How_We_Get_It.2C_.26_How_We_Use_It'>collect little nonpublic information</a> about users and retain that information for a <a href='https://meta.wikimedia.org/wiki/Data_retention_guidelines'>short period of time</a>. But when we do have data, we carefully evaluate every request before considering disclosure. If the requests do not meet our <a href='https://wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines'>standards</a>—if they are overly broad, unclear, or irrelevant—we will push back on behalf of our users.</p><p>If we must produce information due to a legally valid request, we will notify the affected user before we disclose, if we are legally permitted and have the means to do so. In certain cases, we may help find assistance for users to fight an invalid request.</p><p>Below, you will find more information about the requests for user data we receive.</p>" + intro: "<p>However, every year, governments, individuals, and corporations ask us to disclose user data. Often, we have no nonpublic information to disclose because we <a href='https://wikimediafoundation.org/wiki/Privacy_policy#Types_of_Information_We_Receive_From_You.2C_How_We_Get_It.2C_.26_How_We_Use_It'>collect little nonpublic information</a> about users and retain that information for a <a href='https://meta.wikimedia.org/wiki/Data_retention_guidelines'>short period of time</a>. But when we do have data, we carefully evaluate every request before considering disclosure. If the requests do not meet our <a href='https://wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines'>standards</a>—if they are overly broad, unclear, or irrelevant—we will push back on behalf of our users.</p><p>If we must produce information due to a legally valid request, we will <a href='https://wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines#Notifying_Our_Users_of_Your_Request'>notify the affected user</a> before we disclose, if we are <a href='/faq.html#nonpublic_personal_information'>legally permitted and have the means</a> to do so. In certain cases, we may <a href='/faq.html#my_personal_information'>help find assistance</a> for users to fight an invalid request.</p><p>Below, you will find more information about the requests for user data we receive.</p>" quote: "Man is least himself when he talks in his own person. Give him a mask, and he will tell you the truth." cite: "<a href='https://en.wikipedia.org/wiki/Oscar_Wilde'>Oscar Wilde</a> <small>Writer & Poet (<a href='https://en.wikiquote.org/wiki/Oscar_Wilde'>1891</a>)</small>" summary: "Summary" compared_to_others: "Compared to other companies, we received relatively few requests" request_response: "Requests for user data, and how we responded" - information_produced: "Information Produced" + information_produced: "Number of Times Information Produced" informal_non_govt: "Informal Non-Government Requests" informal_govt: "Informal Government Requests" civil_subpoenas: "Civil Subpoenas" diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb index 9dbfff3..bae4b0c 100644 --- a/source/layouts/layout.erb +++ b/source/layouts/layout.erb @@ -52,9 +52,9 @@ <div class="col-md-2"> <ul> - <li><a href="#"><%= t('menu.privacy') %></a></li> - <li><a href="#"><%= t('menu.content') %></a></li> - <li><a href="#"><%= t('menu.faq') %></a></li> + <li><a href="/privacy.html"><%= t('menu.privacy') %></a></li> + <li><a href="/content.html"><%= t('menu.content') %></a></li> + <li><a href="/faq.html"><%= t('menu.faq') %></a></li> </ul> </div> @@ -69,8 +69,8 @@ <div class="col-md-2"> <ul> - <li><a href="#"><%= t('menu.about_us') %></a></li> - <li><a href="#"><%= t('menu.blog') %></a></li> + <li><a href="http://wikimediafoundation.org"><%= t('menu.about_us') %></a></li> + <li><a href="https://blog.wikimedia.org/"><%= t('menu.blog') %></a></li> </ul> </div> diff --git a/source/localizable/content.html.erb b/source/localizable/content.html.erb index 8f7e256..6afd1be 100644 --- a/source/localizable/content.html.erb +++ b/source/localizable/content.html.erb @@ -36,7 +36,7 @@ <blockquote> <p><%= t('content.quote') %></p> <footer> - <img src="/images/quote_jay.png"> + <a href="http://commons.wikimedia.org/wiki/File:Jay-Z_2011.jpg"><img src="/images/quote_jay.png"></a> <p><%= t('content.cite') %></p> </footer> </blockquote> @@ -44,7 +44,7 @@ <div class="col-md-4"> <div class="story"> - <img src="/images/story_dcri.png"> + <a href="https://fr.wikipedia.org/wiki/Station_hertzienne_militaire_de_Pierre-sur-Haute#mediaviewer/Fichier:Base_militaire_de_Pierre-sur-Haute.jpg"><img src="/images/story_dcri.png"></a> <h3><%= t('content.story1_title') %></h3> <p><%= t('content.story1_body') %></p> </div> @@ -52,7 +52,7 @@ <div class="col-md-4"> <div class="story"> - <img src="/images/story_monkey.png"> + <a href="https://commons.wikimedia.org/wiki/Commons:Featured_picture_candidates/File:Macaca_nigra_self-portrait_%28rotated_and_cropped%29.jpg#File:Macaca_nigra_self-portrait_.28rotated_and_cropped.29.jpg"><img src="/images/story_monkey.png"></a> <h3><%= t('content.story2_title') %></h3> <p><%= t('content.story2_body') %></p> </div> @@ -60,7 +60,7 @@ <div class="col-md-4"> <div class="story"> - <img src="/images/story_aboriginal.png"> + <a href="https://en.wikipedia.org/wiki/Mount_Wellington_%28Tasmania%29#mediaviewer/File:Mount_Wellington.jpg"><img src="/images/story_aboriginal.png"></a> <h3><%= t('content.story3_title') %></h3> <p><%= t('content.story3_body') %></p> </div> @@ -124,7 +124,7 @@ <blockquote> <p><%= t('content.quote2') %></p> <footer> - <img src="/images/quote_samuelson.png"> + <a href="https://en.wikipedia.org/wiki/Pamela_Samuelson#mediaviewer/File:Pamela_Samuelson,_2005.jpg"><img src="/images/quote_samuelson.png"></a> <p><%= t('content.cite2') %></p> </footer> </blockquote> @@ -132,7 +132,7 @@ <div class="col-md-4"> <div class="story"> - <img src="/images/story_ruth.png"> + <a href="https://en.wikipedia.org/wiki/Babe_Ruth%27s_called_shot#mediaviewer/File:Ruth1932-1.jpg"><img src="/images/story_ruth.png"></a> <h3> <%= t('content.s_t_babe_ruth') %> </h3> @@ -152,7 +152,7 @@ <div class="col-md-4"> <div class="story"> - <img src="/images/story_classics.png"> + <a href="https://commons.wikimedia.org/wiki/Jane_Austen#mediaviewer/File:Jane_Austen_coloured_version.jpg"><img src="/images/story_classics.png"></a> <h3> <%= t('content.s_t_classic') %> </h3> diff --git a/source/localizable/index.html.erb b/source/localizable/index.html.erb index a3012a9..1a4126f 100644 --- a/source/localizable/index.html.erb +++ b/source/localizable/index.html.erb @@ -47,7 +47,7 @@ <blockquote class="middle"> <p><%= t('home.quote') %></p> <footer> - <img src="/images/quote_brandeis.png"> + <a href="https://en.wikipedia.org/wiki/Louis_Brandeis#mediaviewer/File:Brandeisl.jpg"><img src="/images/quote_brandeis.png"></a> <p><%= t('home.cite') %></p> </footer> </blockquote> diff --git a/source/localizable/privacy.html.erb b/source/localizable/privacy.html.erb index 7dcd1c8..60fc849 100644 --- a/source/localizable/privacy.html.erb +++ b/source/localizable/privacy.html.erb @@ -35,7 +35,7 @@ <blockquote> <p><%= t('privacy.quote') %></p> <footer> - <img src="/images/quote_wilde.png"> + <a href="https://en.wikipedia.org/wiki/Oscar_Wilde#mediaviewer/File:Oscar_Wilde_Sarony.jpg"><img src="/images/quote_wilde.png"></a> <p><%= t('privacy.cite') %></p> </footer> </blockquote> @@ -68,7 +68,7 @@ <td>5</td> </tr> <tr> - <td class="indent"><%= t('privacy.administrative_subpoenas') %></td> + <td class="indent"><a href="https://en.wikipedia.org/wiki/Administrative_subpoena"><%= t('privacy.administrative_subpoenas') %></a></td> <td>0</td> </tr> <tr> -- To view, visit https://gerrit.wikimedia.org/r/151586 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I566eb1f510144ea0e24f9d4d8c5ec03e92849a4e Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/TransparencyReport Gerrit-Branch: master Gerrit-Owner: MSyed <ms...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits