<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[GlotPress][778] trunk/locales/locales.php: Make methods public static and stop calling the methods of Gettext_Translations statically in locales.php.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://glotpress.trac.wordpress.org/changeset/778">778</a></dd>
<dt>Author</dt> <dd>markoheijnen</dd>
<dt>Date</dt> <dd>2013-06-19 12:08:13 +0000 (Wed, 19 Jun 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make methods public static and stop calling the methods of Gettext_Translations statically in locales.php. See <a href="http://glotpress.trac.wordpress.org/ticket/220">#220</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklocaleslocalesphp">trunk/locales/locales.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklocaleslocalesphp"></a>
<div class="modfile"><h4>Modified: trunk/locales/locales.php (777 => 778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/locales/locales.php 2013-06-18 22:12:28 UTC (rev 777)
+++ trunk/locales/locales.php 2013-06-19 12:08:13 UTC (rev 778)
</span><span class="lines">@@ -14,22 +14,22 @@
</span><span class="cx"> var $facebook_locale = null;
</span><span class="cx"> // TODO: days, months, decimals, quotes
</span><span class="cx">
</span><del>- function GP_Locale( $args = array() ) {
</del><ins>+ public function GP_Locale( $args = array() ) {
</ins><span class="cx"> foreach( $args as $key => $value ) {
</span><span class="cx"> $this->$key = $value;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static function __set_state( $state ) {
</del><ins>+ public static function __set_state( $state ) {
</ins><span class="cx"> return new GP_Locale( $state );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function combined_name() {
</del><ins>+ public function combined_name() {
</ins><span class="cx"> /* translators: combined name for locales: 1: name in English, 2: native name */
</span><span class="cx"> return sprintf( _x( '%1$s/%2$s', 'locales' ), $this->english_name, $this->native_name );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function numbers_for_index( $index, $how_many = 3, $test_up_to = 1000 ) {
</del><ins>+ public function numbers_for_index( $index, $how_many = 3, $test_up_to = 1000 ) {
</ins><span class="cx"> $numbers = array();
</span><span class="cx"> for( $number = 0; $number < $test_up_to; ++$number ) {
</span><span class="cx"> if ( $this->index_for_number( $number ) == $index ) {
</span><span class="lines">@@ -40,10 +40,11 @@
</span><span class="cx"> return $numbers;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function index_for_number( $number ) {
</del><ins>+ public function index_for_number( $number ) {
</ins><span class="cx"> if ( !isset( $this->_index_for_number ) ) {
</span><del>- $expression = Gettext_Translations::parenthesize_plural_exression( $this->plural_expression );
- $this->_index_for_number = Gettext_Translations::make_plural_form_function( $this->nplurals, $expression );
</del><ins>+ $gettext = new Gettext_Translations;
+ $expression = $gettext->parenthesize_plural_exression( $this->plural_expression );
+ $this->_index_for_number = $gettext->make_plural_form_function( $this->nplurals, $expression );
</ins><span class="cx"> }
</span><span class="cx"> $f = $this->_index_for_number;
</span><span class="cx"> return $f( $number );
</span><span class="lines">@@ -54,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> var $locales = array();
</span><span class="cx">
</span><del>- function GP_Locales() {
</del><ins>+ public function GP_Locales() {
</ins><span class="cx"> $aa = new GP_Locale();
</span><span class="cx"> $aa->english_name = 'Afar';
</span><span class="cx"> $aa->native_name = 'Afaraf';
</span><span class="lines">@@ -1861,40 +1862,43 @@
</span><span class="cx"> $zh->plural_expression = '0';
</span><span class="cx">
</span><span class="cx"> foreach( get_defined_vars() as $locale ) {
</span><del>- $this->locales[$locale->slug] = $locale;
</del><ins>+ $this->locales[ $locale->slug ] = $locale;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function &instance() {
- if ( !isset( $GLOBALS['gp_locales'] ) )
</del><ins>+ public static function &instance() {
+ if ( ! isset( $GLOBALS['gp_locales'] ) )
</ins><span class="cx"> $GLOBALS['gp_locales'] = new GP_Locales;
</span><ins>+
</ins><span class="cx"> return $GLOBALS['gp_locales'];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function locales() {
</del><ins>+ public static function locales() {
</ins><span class="cx"> $instance = GP_Locales::instance();
</span><span class="cx"> return $instance->locales;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function exists( $slug ) {
</del><ins>+ public static function exists( $slug ) {
</ins><span class="cx"> $instance = GP_Locales::instance();
</span><del>- return isset( $instance->locales[$slug] );
</del><ins>+ return isset( $instance->locales[ $slug ] );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- function by_slug( $slug ) {
</del><ins>+ public static function by_slug( $slug ) {
</ins><span class="cx"> $instance = GP_Locales::instance();
</span><del>- return isset( $instance->locales[$slug] )? $instance->locales[$slug] : null;
</del><ins>+ return isset( $instance->locales[ $slug ] )? $instance->locales[ $slug ] : null;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- function by_field( $field_name, $field_value ) {
</del><ins>+ public static function by_field( $field_name, $field_value ) {
</ins><span class="cx"> $instance = GP_Locales::instance();
</span><del>- $result = false;
</del><ins>+ $result = false;
+
</ins><span class="cx"> foreach( $instance->locales() as $locale ) {
</span><span class="cx"> if ( isset( $locale->$field_name ) && $locale->$field_name == $field_value ) {
</span><span class="cx"> $result = $locale;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> return $result;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>