<!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>[9986] sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/locales/locales.php: Locales: Sync file with the upstream version of GlotPress.</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 { white-space: pre-line; 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="http://meta.trac.wordpress.org/changeset/9986">9986</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/9986","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>2020-06-28 13:05:19 +0000 (Sun, 28 Jun 2020)</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'>Locales: Sync file with the upstream version of GlotPress.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentmupluginspublocaleslocalesphp">sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/locales/locales.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentmupluginspublocaleslocalesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/locales/locales.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/locales/locales.php 2020-06-26 17:17:39 UTC (rev 9985)
+++ sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/locales/locales.php 2020-06-28 13:05:19 UTC (rev 9986)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,9 +2,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Locales used on WordPress.org.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * - Copy of https://github.com/GlotPress/GlotPress-WP/blob/ed1160237f77fa4f8e5bbb8ae195573f6232423e/locales/no-variants/locales.php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * - Copy of https://github.com/GlotPress/GlotPress-WP/blob/4e75ab6/locales/locales.php
</ins><span class="cx" style="display: block; padding: 0 10px"> * - With support for custom locale variants.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * - Without https://github.com/GlotPress/GlotPress-WP/pull/1012.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * - Without https://github.com/GlotPress/GlotPress-WP/pull/1012 and https://github.com/GlotPress/GlotPress-WP/pull/1017.
</ins><span class="cx" style="display: block; padding: 0 10px"> * - Without other dependencies because the file gets also loaded in api.wordpress.org context.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! class_exists( 'GP_Locale' ) ) :
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,6 +114,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $f( $number );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * When converting the object to a string, the combined name is returned.
+ *
+ * @since 3.0.0
+ *
+ * @return string Combined name of locale.
+ */
+ public function __toString() {
+ return $this->combined_name();
+ }
</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"> endif;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -784,7 +794,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $es_cl->wp_locale = 'es_CL';
</span><span class="cx" style="display: block; padding: 0 10px"> $es_cl->slug = 'es-cl';
</span><span class="cx" style="display: block; padding: 0 10px"> $es_cl->google_code = 'es';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $es_cl->facebook_locale = 'es_CL';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $es_cl->facebook_locale = 'es_LA';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $es_co = new GP_Locale();
</span><span class="cx" style="display: block; padding: 0 10px"> $es_co->english_name = 'Spanish (Colombia)';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -796,7 +806,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $es_co->wp_locale = 'es_CO';
</span><span class="cx" style="display: block; padding: 0 10px"> $es_co->slug = 'es-co';
</span><span class="cx" style="display: block; padding: 0 10px"> $es_co->google_code = 'es';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $es_co->facebook_locale = 'es_CO';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $es_co->facebook_locale = 'es_LA';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $es_cr = new GP_Locale();
</span><span class="cx" style="display: block; padding: 0 10px"> $es_cr->english_name = 'Spanish (Costa Rica)';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -807,6 +817,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $es_cr->country_code = 'cr';
</span><span class="cx" style="display: block; padding: 0 10px"> $es_cr->wp_locale = 'es_CR';
</span><span class="cx" style="display: block; padding: 0 10px"> $es_cr->slug = 'es-cr';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $es_cr->google_code = 'es';
+ $es_cr->facebook_locale = 'es_LA';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $es_do = new GP_Locale();
</span><span class="cx" style="display: block; padding: 0 10px"> $es_do->english_name = 'Spanish (Dominican Republic)';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -818,7 +830,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $es_do->wp_locale = 'es_DO';
</span><span class="cx" style="display: block; padding: 0 10px"> $es_do->slug = 'es-do';
</span><span class="cx" style="display: block; padding: 0 10px"> $es_do->google_code = 'es';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $es_do->facebook_locale = 'es_LA';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $es_ec = new GP_Locale();
+ $es_ec->english_name = 'Spanish (Ecuador)';
+ $es_ec->native_name = 'Español de Ecuador';
+ $es_ec->lang_code_iso_639_1 = 'es';
+ $es_ec->lang_code_iso_639_2 = 'spa';
+ $es_ec->lang_code_iso_639_3 = 'spa';
+ $es_ec->country_code = 'ec';
+ $es_ec->wp_locale = 'es_EC';
+ $es_ec->slug = 'es-ec';
+ $es_ec->google_code = 'es';
+ $es_ec->facebook_locale = 'es_LA';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $es_gt = new GP_Locale();
</span><span class="cx" style="display: block; padding: 0 10px"> $es_gt->english_name = 'Spanish (Guatemala)';
</span><span class="cx" style="display: block; padding: 0 10px"> $es_gt->native_name = 'Español de Guatemala';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -841,6 +866,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $es_hn->wp_locale = 'es_HN';
</span><span class="cx" style="display: block; padding: 0 10px"> $es_hn->slug = 'es-hn';
</span><span class="cx" style="display: block; padding: 0 10px"> $es_hn->google_code = 'es';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $es_hn->facebook_locale = 'es_LA';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $es_mx = new GP_Locale();
</span><span class="cx" style="display: block; padding: 0 10px"> $es_mx->english_name = 'Spanish (Mexico)';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -896,6 +922,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $es_uy->country_code = 'uy';
</span><span class="cx" style="display: block; padding: 0 10px"> $es_uy->wp_locale = 'es_UY';
</span><span class="cx" style="display: block; padding: 0 10px"> $es_uy->slug = 'es-uy';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $es_uy->google_code = 'es';
+ $es_uy->facebook_locale = 'es_LA';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $es_ve = new GP_Locale();
</span><span class="cx" style="display: block; padding: 0 10px"> $es_ve->english_name = 'Spanish (Venezuela)';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -907,7 +935,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $es_ve->wp_locale = 'es_VE';
</span><span class="cx" style="display: block; padding: 0 10px"> $es_ve->slug = 'es-ve';
</span><span class="cx" style="display: block; padding: 0 10px"> $es_ve->google_code = 'es';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $es_ve->facebook_locale = 'es_VE';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $es_ve->facebook_locale = 'es_LA';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $et = new GP_Locale();
</span><span class="cx" style="display: block; padding: 0 10px"> $et->english_name = 'Estonian';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -994,6 +1022,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $fo->slug = 'fo';
</span><span class="cx" style="display: block; padding: 0 10px"> $fo->facebook_locale = 'fo_FO';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fon = new GP_Locale();
+ $fon->english_name = 'Fon';
+ $fon->native_name = 'fɔ̀ngbè';
+ $fon->lang_code_iso_639_2 = 'fon';
+ $fon->lang_code_iso_639_3 = 'fon';
+ $fon->country_code = 'bj';
+ $fon->wp_locale = 'fon';
+ $fon->slug = 'fon';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $fr = new GP_Locale();
</span><span class="cx" style="display: block; padding: 0 10px"> $fr->english_name = 'French (France)';
</span><span class="cx" style="display: block; padding: 0 10px"> $fr->native_name = 'Français';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1565,7 +1602,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $lo->native_name = 'ພາສາລາວ';
</span><span class="cx" style="display: block; padding: 0 10px"> $lo->lang_code_iso_639_1 = 'lo';
</span><span class="cx" style="display: block; padding: 0 10px"> $lo->lang_code_iso_639_2 = 'lao';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $lo->country_code = 'LA';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $lo->country_code = 'la';
</ins><span class="cx" style="display: block; padding: 0 10px"> $lo->wp_locale = 'lo';
</span><span class="cx" style="display: block; padding: 0 10px"> $lo->slug = 'lo';
</span><span class="cx" style="display: block; padding: 0 10px"> $lo->nplurals = 1;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2031,7 +2068,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $roh = new GP_Locale();
</span><span class="cx" style="display: block; padding: 0 10px"> $roh->english_name = 'Romansh';
</span><span class="cx" style="display: block; padding: 0 10px"> $roh->native_name = 'Rumantsch';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $roh->lang_code_iso_639_2 = 'rm';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $roh->lang_code_iso_639_1 = 'rm';
+ $roh->lang_code_iso_639_2 = 'roh';
</ins><span class="cx" style="display: block; padding: 0 10px"> $roh->lang_code_iso_639_3 = 'roh';
</span><span class="cx" style="display: block; padding: 0 10px"> $roh->country_code = 'ch';
</span><span class="cx" style="display: block; padding: 0 10px"> $roh->wp_locale = 'roh';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2155,7 +2193,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $snd->english_name = 'Sindhi';
</span><span class="cx" style="display: block; padding: 0 10px"> $snd->native_name = 'سنڌي';
</span><span class="cx" style="display: block; padding: 0 10px"> $snd->lang_code_iso_639_1 = 'sd';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $snd->lang_code_iso_639_2 = 'sd';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $snd->lang_code_iso_639_2 = 'snd';
</ins><span class="cx" style="display: block; padding: 0 10px"> $snd->lang_code_iso_639_3 = 'snd';
</span><span class="cx" style="display: block; padding: 0 10px"> $snd->country_code = 'pk';
</span><span class="cx" style="display: block; padding: 0 10px"> $snd->wp_locale = 'snd';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2486,11 +2524,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $vec = new GP_Locale();
</span><span class="cx" style="display: block; padding: 0 10px"> $vec->english_name = 'Venetian';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $vec->native_name = 'Vèneta';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $vec->native_name = 'Vèneto';
</ins><span class="cx" style="display: block; padding: 0 10px"> $vec->lang_code_iso_639_2 = 'roa';
</span><span class="cx" style="display: block; padding: 0 10px"> $vec->lang_code_iso_639_3 = 'vec';
</span><span class="cx" style="display: block; padding: 0 10px"> $vec->country_code = 'it';
</span><span class="cx" style="display: block; padding: 0 10px"> $vec->slug = 'vec';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $vec->wp_locale = 'vec';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $vi = new GP_Locale();
</span><span class="cx" style="display: block; padding: 0 10px"> $vi->english_name = 'Vietnamese';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2565,6 +2604,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $yor->google_code = 'yo';
</span><span class="cx" style="display: block; padding: 0 10px"> $yor->facebook_locale = 'yo_NG';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $zgh = new GP_Locale();
+ $zgh->english_name = 'Tamazight';
+ $zgh->native_name = 'ⵜⴰⵎⴰⵣⵉⵖⵜ';
+ $zgh->lang_code_iso_639_2 = 'zgh';
+ $zgh->lang_code_iso_639_3 = 'zgh';
+ $zgh->country_code = 'ma';
+ $zgh->wp_locale = 'zgh';
+ $zgh->slug = 'zgh';
+ $zgh->nplurals = 2;
+ $zgh->plural_expression = 'n >= 2 && (n < 11 || n > 99)';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $zh = new GP_Locale();
</span><span class="cx" style="display: block; padding: 0 10px"> $zh->english_name = 'Chinese';
</span><span class="cx" style="display: block; padding: 0 10px"> $zh->native_name = '中文';
</span></span></pre>
</div>
</div>
</body>
</html>