http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72521
Revision: 72521
Author: siebrand
Date: 2010-09-07 08:32:07 +0000 (Tue, 07 Sep 2010)
Log Message:
-----------
Follow-up r72519: also remove old OpenLayers FFS classes.
Modified Paths:
--------------
trunk/extensions/Translate/_autoload.php
Removed Paths:
-------------
trunk/extensions/Translate/ffs/OpenLayers.php
Modified: trunk/extensions/Translate/_autoload.php
===================================================================
--- trunk/extensions/Translate/_autoload.php 2010-09-07 07:52:43 UTC (rev
72520)
+++ trunk/extensions/Translate/_autoload.php 2010-09-07 08:32:07 UTC (rev
72521)
@@ -82,8 +82,6 @@
$wgAutoloadClasses['WikiExtensionFormatWriter'] = $dir .
'ffs/WikiExtension.php';
$wgAutoloadClasses['GettextFormatReader'] = $dir . 'ffs/Gettext.php';
$wgAutoloadClasses['GettextFormatWriter'] = $dir . 'ffs/Gettext.php';
-$wgAutoloadClasses['OpenLayersFormatReader'] = $dir . 'ffs/OpenLayers.php';
-$wgAutoloadClasses['OpenLayersFormatWriter'] = $dir . 'ffs/OpenLayers.php';
$wgAutoloadClasses['XliffFormatWriter'] = $dir . 'ffs/Xliff.php';
/*...@}*/
Deleted: trunk/extensions/Translate/ffs/OpenLayers.php
===================================================================
--- trunk/extensions/Translate/ffs/OpenLayers.php 2010-09-07 07:52:43 UTC
(rev 72520)
+++ trunk/extensions/Translate/ffs/OpenLayers.php 2010-09-07 08:32:07 UTC
(rev 72521)
@@ -1,186 +0,0 @@
-<?php
-/**
- * OpenLayers JavaScript language class file format handler.
- *
- * @author Robert Leverington
- * @copyright Copyright © 2009 Robert Leverington
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
- * @file
- */
-
-/**
- * Old style parser for JavaScript format files.
- */
-class OpenLayersFormatReader extends SimpleFormatReader {
- protected $keyquote = true;
-
- private static function unescapeJsString( $string ) {
- // See ECMA 262 section 7.8.4 for string literal format
- $pairs = array(
- "\\" => "\\\\",
- "\"" => "\\\"",
- '\'' => '\\\'',
- "\n" => "\\n",
- "\r" => "\\r",
-
- # To avoid closing the element or CDATA section
- "<" => "\\x3c",
- ">" => "\\x3e",
-
- # To avoid any complaints about bad entity refs
- "&" => "\\x26",
-
- # Work around
https://bugzilla.mozilla.org/show_bug.cgi?id=274152
- # Encode certain Unicode formatting chars so affected
- # versions of Gecko do not misinterpret our strings;
- # this is a common problem with Farsi text.
- "\xe2\x80\x8c" => "\\u200c", // ZERO WIDTH NON-JOINER
- "\xe2\x80\x8d" => "\\u200d", // ZERO WIDTH JOINER
- );
- $pairs = array_flip( $pairs );
-
- return strtr( $string, $pairs );
- }
-
- private function leftTrim( $string ) {
- $string = ltrim( $string );
- $string = ltrim( $string, '"' );
- return $string;
- }
-
- /**
- * Parse OpenLayer JavaScript language class.
- *
- * @param $mangler StringMangler
- * @return \array Messages from the file.
- *
- * @todo Known issues:
- * - It is a requirement for key names to be enclosed in single
- * quotation marks, and for messages to be enclosed in double.
- * - The last key-value pair must have a comma at the end.
- * - Uses seperate $this->leftTrim() function, this is undersired.
- */
- public function parseMessages( StringMangler $mangler ) {
- $data = file_get_contents( $this->filename );
-
- // Add trailing comma to last key pair.
- $data = str_replace( "\"\n};", "\",\n};", $data );
-
- // Just get relevant data.
- $dataStart = strpos( $data, '{' );
- $dataEnd = strrpos( $data, '}' );
- $data = substr( $data, $dataStart + 1, $dataEnd - $dataStart -
1 );
- // Strip comments.
- $data = preg_replace( '#^(\s*?)//(.*?)$#m', '', $data );
- // Break in to message segements for further parsing.
- $data = explode( '",', $data );
-
- $messages = array();
- // Process each segment.
- foreach ( $data as $segment ) {
- // Remove excess quote mark at beginning.
- $segment = substr( $segment, 1 );
- // Add back trailing quote.
- $segment .= '"';
- // Concatenate seperate strings.
- $segment = explode( '" +', $segment );
- $segment = array_map( array( $this, 'leftTrim' ),
$segment );
- $segment = implode( $segment );
- # $segment = preg_replace( '#\" \+(.*?)\"#m', '',
$segment );
- // Break in to key and message.
- if ( $this->keyquote ) {
- $segments = explode( "':", $segment );
- } else {
- $segments = explode( ': ', $segment );
- }
- $key = $segments[ 0 ];
- unset( $segments[ 0 ] );
- $value = implode( $segments );
- // Strip excess whitespace from both.
- $key = trim( $key );
- $value = trim( $value );
- // Remove quotation marks and syntax.
- if ( $this->keyquote ) {
- $key = substr( $key, 1 );
- }
- $value = substr( $value, 1, -1 );
- $messages[ $key ] = self::unescapeJsString( $value );
- }
-
- // Remove extraneous key that is sometimes present.
- unset( $messages[ 0 ] );
-
- return $messages;
- }
-}
-
-/**
- * Old style writer for JavaScript format files.
- */
-class OpenLayersFormatWriter extends SimpleFormatWriter {
-
- /**
- * Export a languages messages.
- * @param $target File handler.
- * @param $collection MessageCollection.
- */
- protected function exportLanguage( $target, MessageCollection
$collection ) {
- $code = $collection->code;
- $names = Language::getLanguageNames();
- $name = $names[ $code ];
-
- // Generate list of authors for comment.
- $authors = $collection->getAuthors();
- $authors = $this->filterAuthors( $authors, $collection->code,
$this->group->getId() );
- $authorList = '';
-
- foreach ( $authors as $author ) {
- $authorList .= " * - $author\n";
- }
-
- // Generate header and write.
- $header = <<<EOT
-/* Copyright (c) 2006-2008 MetaCarta, Inc., published under the Clear BSD
- * license. See http://svn.openlayers.org/trunk/openlayers/license.txt for the
- * full text of the license. */
-
-/* Translators (2009 onwards):
-$authorList */
-
-/**
- * @requires OpenLayers/Lang.js
- */
-
-/**
- * Namespace: OpenLayers.Lang["$code"]
- * Dictionary for $name. Keys for entries are used in calls to
- * <OpenLayers.Lang.translate>. Entry bodies are normal strings or
- * strings formatted for use with <OpenLayers.String.format> calls.
- */
-OpenLayers.Lang["$code"] = OpenLayers.Util.applyDefaults({
-
-
-EOT;
- fwrite( $target, $header );
-
- // Get and write messages.
- $lines = '';
- foreach ( $collection as $message ) {
- $value = Xml::escapeJsString( $message->translation() );
- if ( $this->keyquote ) {
- $key = Xml::escapeJsString( $message->key() );
- $lines .= " '{$key}': \"{$value}\",\n\n";
- } else {
- $lines .= " {$message->key()}:
\"{$value}\",\n\n";
- }
- }
-
- // Strip last comma.
- $lines = substr( $lines, 0, -3 );
- $lines .= "\n\n";
- fwrite( $target, $lines );
-
- // File terminator.
- fwrite( $target, '});' );
- }
-}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
