r109000 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r108999‎ | r109000 | r109001 >
Date:20:53, 15 January 2012
Author:platonides
Status:reverted (Comments)
Tags:
Comment:
Follow-up r108915, r108963. Base the pd-usgov-work templates
on a new wm-license-pd-usgov-work-template msg, since most
of their text will be common on any language.
Modified paths:
  • /trunk/extensions/WikimediaMessages/WikimediaLicenseTexts.i18n.php (modified) (history)

Diff [purge]

Index: trunk/extensions/WikimediaMessages/WikimediaLicenseTexts.i18n.php
@@ -289,18 +289,19 @@
290290 'wm-license-pd-author-with-author-any-purpose' => '$1 grants anyone the right to use this work \'\'\'for any purpose\'\'\', without any conditions, unless such conditions are required by law.',
291291 'wm-license-pd-usgov-wiki-link' => 'w:en:Federal government of the United States',
292292 'wm-license-pd-usgov-work-wiki-link' => 'w:en:Copyright status of work by the U.S. government',
293 - 'wm-license-pd-usgov-fema-text' => 'This file is a work of an employee of the [[{{int:wm-license-pd-usgov-fema-wiki-link}}|Federal Emergency Management Agency]], taken or made during the course of the person\'s official duties. As a [[{{int:wm-license-pd-usgov-work-wiki-link}}|work]] of the [[{{int:wm-license-pd-usgov-wiki-link}}|U.S. federal government]], the file is in the \'\'\'[[{{int:wm-license-pd-wiki-link}}|public domain]]\'\'\'.',
 293+ 'wm-license-pd-usgov-work-template' => 'This file is a work of {{{1}}}, taken or made during the course of the person\'s official duties. As a [[{{int:wm-license-pd-usgov-work-wiki-link}}|work]] of the [[{{int:wm-license-pd-usgov-wiki-link}}|U.S. federal government]], the file is in the \'\'\'[[{{int:wm-license-pd-wiki-link}}|public domain]]\'\'\'.',
 294+ 'wm-license-pd-usgov-fema-text' => '{{int:wm-license-pd-usgov-work-template|an employee of the [[{{int:wm-license-pd-usgov-fema-wiki-link}}|Federal Emergency Management Agency]]}}',
294295 'wm-license-pd-usgov-fema-wiki-link' => 'w:en:Federal Emergency Management Agency',
295 - 'wm-license-pd-usgov-military-text' => 'This file is a work of a [[{{int:wm-license-pd-usgov-military-armed-forces-wiki-link}}|U.S. military]] or [[{{int:wm-license-pd-usgov-military-dod-wiki-link}}|Department of Defense]] employee, taken or made during the course of the person\'s official duties. As a [[{{int:wm-license-pd-usgov-work-wiki-link}}|work]] of the [[{{int:wm-license-pd-usgov-wiki-link}}|U.S. federal government]], the file is in the \'\'\'[[{{int:wm-license-pd-wiki-link}}|public domain]]\'\'\'.',
 296+ 'wm-license-pd-usgov-military-text' => '{{int:wm-license-pd-usgov-work-template|a [[{{int:wm-license-pd-usgov-military-armed-forces-wiki-link}}|U.S. military]] or [[{{int:wm-license-pd-usgov-military-dod-wiki-link}}|Department of Defense]] employee}}',
296297 'wm-license-pd-usgov-military-armed-forces-wiki-link' => 'w:en:United States Armed Forces',
297298 'wm-license-pd-usgov-military-dod-wiki-link' => 'w:en:United States Department of Defense',
298 - 'wm-license-pd-usgov-military-air-force-text' => 'This file is a work of an airman or employee of the [[{{int:wm-license-pd-usgov-military-air-force-wiki-link}}|U.S. Air Force]], taken or made during the course of the person\'s official duties. As a [[{{int:wm-license-pd-usgov-work-wiki-link}}|work]] of the [[{{int:wm-license-pd-usgov-wiki-link}}|U.S. federal government]], the file is in the \'\'\'[[{{int:wm-license-pd-wiki-link}}|public domain]]\'\'\'.',
 299+ 'wm-license-pd-usgov-military-air-force-text' => '{{int:wm-license-pd-usgov-work-template|an airman or employee of the [[{{int:wm-license-pd-usgov-military-air-force-wiki-link}}|U.S. Air Force]]}}',
299300 'wm-license-pd-usgov-military-air-force-wiki-link' => 'w:en:United States Air Force',
300 - 'wm-license-pd-usgov-military-army-text' => 'This file is a work of a soldier or employee of the [[{{int:wm-license-pd-usgov-military-army-wiki-link}}|U.S. Army]], taken or made during the course of the person\'s official duties. As a [[{{int:wm-license-pd-usgov-work-wiki-link}}|work]] of the [[{{int:wm-license-pd-usgov-wiki-link}}|U.S. federal government]], the file is in the \'\'\'[[{{int:wm-license-pd-wiki-link}}|public domain]]\'\'\'.',
 301+ 'wm-license-pd-usgov-military-army-text' => '{{int:wm-license-pd-usgov-work-template|a soldier or employee of the [[{{int:wm-license-pd-usgov-military-army-wiki-link}}|U.S. Army]]}}',
301302 'wm-license-pd-usgov-military-army-wiki-link' => 'w:en:United States Army',
302 - 'wm-license-pd-usgov-military-navy-text' => 'This file is a work of a sailor or employee of the [[{{int:wm-license-pd-usgov-military-navy-wiki-link}}|U.S. Navy]], taken or made during the course of the person\'s official duties. As a [[{{int:wm-license-pd-usgov-work-wiki-link}}|work]] of the [[{{int:wm-license-pd-usgov-wiki-link}}|U.S. federal government]], the file is in the \'\'\'[[{{int:wm-license-pd-wiki-link}}|public domain]]\'\'\'.',
 303+ 'wm-license-pd-usgov-military-navy-text' => '{{int:wm-license-pd-usgov-work-template|a sailor or employee of the [[{{int:wm-license-pd-usgov-military-navy-wiki-link}}|U.S. Navy]]}}',
303304 'wm-license-pd-usgov-military-navy-wiki-link' => 'w:en:United States Navy',
304 - 'wm-license-pd-usgov-noaa-text' => 'This file is a work of an employee of the [[{{int:wm-license-pd-usgov-noaa-wiki-link}}|U.S. National Oceanic and Atmospheric Administration]], taken or made during the course of the person\'s official duties. As a [[{{int:wm-license-pd-usgov-work-wiki-link}}|work]] of the [[{{int:wm-license-pd-usgov-wiki-link}}|U.S. federal government]], the file is in the \'\'\'[[{{int:wm-license-pd-wiki-link}}|public domain]]\'\'\'.',
 305+ 'wm-license-pd-usgov-noaa-text' => '{{int:wm-license-pd-usgov-work-template|an employee of the [[{{int:wm-license-pd-usgov-noaa-wiki-link}}|U.S. National Oceanic and Atmospheric Administration]]}}',
305306 'wm-license-pd-usgov-noaa-wiki-link' => 'w:en:National Oceanic and Atmospheric Administration',
306307 'wm-license-pd-wiki-link' => 'w:en:public domain',
307308 'wm-license-self-one-license' => 'I, the copyright holder of this work, hereby publish it under the following license:',

Follow-up revisions

RevisionCommit summaryAuthorDate
r109001Revert r109000. Please don't introduce lego sentences.multichill21:10, 15 January 2012
r109005Finish r109000 change....platonides22:00, 15 January 2012

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r108915Add messages for the US Army, Air Force and Navy.multichill16:09, 14 January 2012
r108963Some more: FEMA, military & NOAA.multichill10:45, 15 January 2012

Comments

#Comment by Multichill (talk | contribs)   21:09, 15 January 2012

This introduces lego sentences. Should be reverted.

Status & tagging log