<!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][1033] trunk: Replace some references of "Language" with "Locale".</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://glotpress.trac.wordpress.org/changeset/1033">1033</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://glotpress.trac.wordpress.org/changeset/1033","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-05-01 15:31:58 +0000 (Fri, 01 May 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Replace some references of "Language" with "Locale".
That's the first pass to standardize on "locale" given that's what we're often talking about. e.g., en-au is not a "language" but rather a "locale."
props samuelsidler.
see <a href="http://glotpress.trac.wordpress.org/ticket/437">#437</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludesformatsformat_androidphp">trunk/gp-includes/formats/format_android.php</a></li>
<li><a href="#trunkgpincludesroutesglossaryentryphp">trunk/gp-includes/routes/glossary-entry.php</a></li>
<li><a href="#trunkgpincludesschemaphp">trunk/gp-includes/schema.php</a></li>
<li><a href="#trunkgptemplatesprojectphp">trunk/gp-templates/project.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludesformatsformat_androidphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-includes/formats/format_android.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-includes/formats/format_android.php 2015-05-01 15:12:09 UTC (rev 1032)
+++ trunk/gp-includes/formats/format_android.php 2015-05-01 15:31:58 UTC (rev 1033)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $extension = 'xml';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public $exported = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function print_exported_file( $project, $locale, $translation_set, $entries ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->exported = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->line( '<?xml version="1.0" encoding="utf-8"?>' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,7 +40,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data = simplexml_load_string( file_get_contents( $file_name ) );
</span><span class="cx" style="display: block; padding: 0 10px"> libxml_use_internal_errors( $errors );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_object( $data ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_object( $data ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $entries = new Translations;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +77,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $entry->context = $array_name . "[$item_index]";
</span><span class="cx" style="display: block; padding: 0 10px"> $entry->singular = $this->unescape( $item[0] );
</span><span class="cx" style="display: block; padding: 0 10px"> $entry->translations = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $entries->add_entry( $entry );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $item_index++;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,8 +105,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $mapping[ $array_name ] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $mapping[ $array_name ] = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //Because android doesn't fallback on the original language
- //in string-arrays, we fill the non-translated ones with original language string.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Because Android doesn't fallback on the original locale
+ // in string-arrays, we fill the non-translated ones with original locale string.
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = $entry->translations[0];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $value )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,4 +145,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-GP::$formats['android'] = new GP_Format_Android;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+GP::$formats['android'] = new GP_Format_Android;
</ins></span></pre></div>
<a id="trunkgpincludesroutesglossaryentryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-includes/routes/glossary-entry.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-includes/routes/glossary-entry.php 2015-05-01 15:12:09 UTC (rev 1032)
+++ trunk/gp-includes/routes/glossary-entry.php 2015-05-01 15:31:58 UTC (rev 1033)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -241,7 +241,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> while ( ( $data = fgetcsv( $f, 0, ',') ) !== FALSE ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //We're only parsing one language per file right now
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // We're only parsing one locale per file right now
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( count ($data) > 4 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data = array_splice( $data, 2, -2 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunkgpincludesschemaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-includes/schema.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-includes/schema.php 2015-05-01 15:12:09 UTC (rev 1032)
+++ trunk/gp-includes/schema.php 2015-05-01 15:31:58 UTC (rev 1033)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> Translations
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- - There are fields to take all the plural forms (no known language has more than 4 plural forms)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ - There are fields to take all the plural forms (no known locale has more than 4 plural forms)
</ins><span class="cx" style="display: block; padding: 0 10px"> - Belongs to an original string
</span><span class="cx" style="display: block; padding: 0 10px"> - Belongs to a user
</span><span class="cx" style="display: block; padding: 0 10px"> - Status can be: new, approved, unaproved, current, spam or whatever you'd like
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,21 +38,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> KEY `warnings` (`warnings` (1))
</span><span class="cx" style="display: block; padding: 0 10px"> );";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /*
- Translations sets: a translation set holds specific translation of a project in a specific language
- For example each WordPress Spanish translation (formal, informal and that of Diego) will be different sets.
- Most projects will have only one translation set per language.
- */
- $gp_schema['translation_sets'] = "CREATE TABLE IF NOT EXISTS `$gpdb->translation_sets` (
- `id` INT(10) NOT NULL auto_increment,
- `name` VARCHAR(255) NOT NULL,
- `slug` VARCHAR(255) NOT NULL,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ Translations sets: A "translation set" holds all translated strings within a project for a specific locale.
+ For example each WordPress Spanish translation (formal, informal and that of Diego) will be different sets.
+ Most projects will have only one translation set per locale.
+ */
+ $gp_schema['translation_sets'] = "CREATE TABLE IF NOT EXISTS `$gpdb->translation_sets` (
+ `id` INT(10) NOT NULL auto_increment,
+ `name` VARCHAR(255) NOT NULL,
+ `slug` VARCHAR(255) NOT NULL,
</ins><span class="cx" style="display: block; padding: 0 10px"> `project_id` INT(10) DEFAULT NULL,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- `locale` VARCHAR(10) DEFAULT NULL,
- PRIMARY KEY (`id`),
- UNIQUE KEY `project_id_slug_locale` (`project_id`, `slug`, `locale`),
- KEY `locale_slug` (`locale`, `slug`)
- );";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ `locale` VARCHAR(10) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `project_id_slug_locale` (`project_id`, `slug`, `locale`),
+ KEY `locale_slug` (`locale`, `slug`)
+ );";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> Original strings
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,4 +240,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $gp_schema = apply_filters( 'gp_schema', $gp_schema );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $gp_schema;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins></span></pre></div>
<a id="trunkgptemplatesprojectphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-templates/project.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-templates/project.php 2015-05-01 15:12:09 UTC (rev 1032)
+++ trunk/gp-templates/project.php 2015-05-01 15:31:58 UTC (rev 1033)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,8 +31,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="translation-sets tablesorter">
</span><span class="cx" style="display: block; padding: 0 10px"> <thead>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th><?php _e( 'Language' ); ?></th>
- <th><?php echo _x( '%', 'language translation percent header' ); ?></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th><?php _e( 'Locale' ); ?></th>
+ <th><?php echo _x( '%', 'locale translation percent header' ); ?></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <th><?php _e( 'Translated' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <th><?php _e( 'Fuzzy' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <th><?php _e( 'Untranslated' ); ?></th>
</span></span></pre>
</div>
</div>
</body>
</html>