<!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>[7057] sites/trunk/wp15.wordpress.net/public_html/content: WP15: Add dismissible notice when chosen locale is not 100% translated</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/7057">7057</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/7057","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coreymckrill</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-04-06 22:34:48 +0000 (Fri, 06 Apr 2018)</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'>WP15: Add dismissible notice when chosen locale is not 100% translated
This also adds styles to fix a gap beneath the nav bar after it has become
fixed and then the window is scrolled back to the top.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwp15wordpressnetpublic_htmlcontentmupluginsassetslocaleswitcherjs">sites/trunk/wp15.wordpress.net/public_html/content/mu-plugins/assets/locale-switcher.js</a></li>
<li><a href="#sitestrunkwp15wordpressnetpublic_htmlcontentmupluginslocalesphp">sites/trunk/wp15.wordpress.net/public_html/content/mu-plugins/locales.php</a></li>
<li><a href="#sitestrunkwp15wordpressnetpublic_htmlcontentthemestwentyseventeenwp15headerphp">sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/header.php</a></li>
<li><a href="#sitestrunkwp15wordpressnetpublic_htmlcontentthemestwentyseventeenwp15stylecss">sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwp15wordpressnetpublic_htmlcontentmupluginsassetslocaleswitcherjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wp15.wordpress.net/public_html/content/mu-plugins/assets/locale-switcher.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wp15.wordpress.net/public_html/content/mu-plugins/assets/locale-switcher.js 2018-04-06 22:17:08 UTC (rev 7056)
+++ sites/trunk/wp15.wordpress.net/public_html/content/mu-plugins/assets/locale-switcher.js 2018-04-06 22:34:48 UTC (rev 7057)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* global wpCookies */
+( function( window, $, wpCookies ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-( function( window, $ ) {
-
</del><span class="cx" style="display: block; padding: 0 10px"> 'use strict';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> var WP15LocaleSwitcher = window.WP15LocaleSwitcher || {},
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,8 +9,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> app = $.extend( WP15LocaleSwitcher, {
</span><span class="cx" style="display: block; padding: 0 10px"> $switcher: $(),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $notice: $(),
+
</ins><span class="cx" style="display: block; padding: 0 10px"> init: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> app.$switcher = $( '#wp15-locale-switcher' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ app.$notice = $( '.wp15-locale-notice' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> app.$switcher.select2( {
</span><span class="cx" style="display: block; padding: 0 10px"> language: app.locale,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,6 +23,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> app.$switcher.on( 'change', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> $(this).parents( 'form' ).submit();
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ app.$notice.on( 'click', '.wp15-locale-notice-dismiss', function( event ) {
+ event.preventDefault();
+ app.dismissNotice();
+ } );
+ },
+
+ dismissNotice: function() {
+ app.$notice.fadeTo( 100, 0, function() {
+ app.$notice.slideUp( 100, function() {
+ app.$notice.remove();
+ });
+ });
+
+ wpCookies.set(
+ 'wp15-locale-notice-dismissed',
+ true,
+ app.cookie.expires,
+ app.cookie.cpath,
+ app.cookie.domain,
+ app.cookie.secure
+ );
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,4 +52,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> app.init();
</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">-} )( window, jQuery );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} )( window, jQuery, wpCookies );
</ins></span></pre></div>
<a id="sitestrunkwp15wordpressnetpublic_htmlcontentmupluginslocalesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wp15.wordpress.net/public_html/content/mu-plugins/locales.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wp15.wordpress.net/public_html/content/mu-plugins/locales.php 2018-04-06 22:17:08 UTC (rev 7056)
+++ sites/trunk/wp15.wordpress.net/public_html/content/mu-plugins/locales.php 2018-04-06 22:34:48 UTC (rev 7057)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,7 +57,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_register_script(
</span><span class="cx" style="display: block; padding: 0 10px"> 'locale-switcher',
</span><span class="cx" style="display: block; padding: 0 10px"> WP_CONTENT_URL . '/mu-plugins/assets/locale-switcher.js',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( 'jquery', 'select2' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 'jquery', 'select2', 'utils' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 1,
</span><span class="cx" style="display: block; padding: 0 10px"> true
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,6 +68,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'locale' => get_locale(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'dir' => is_rtl() ? 'rtl' : 'ltr',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'cookie' => array(
+ 'expires' => YEAR_IN_SECONDS,
+ 'cpath' => SITECOOKIEPATH,
+ 'domain' => '',
+ 'secure' => true,
+ )
</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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,3 +154,32 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'locale-switcher' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Prints markup for a notice when a locale isn't fully translated.
+ */
+function locale_notice() {
+ $current_locale = get_locale();
+ $status = get_option( 'wp15_locale_status', array() );
+ $threshold = 90;
+ $is_dismissed = ! empty( $_COOKIE['wp15-locale-notice-dismissed'] );
+
+ if ( isset( $status[ $current_locale ] ) && absint( $status[ $current_locale ] ) <= $threshold && ! $is_dismissed ) : ?>
+ <div class="wp15-locale-notice">
+ <p>
+ <?php
+ printf(
+ wp_kses_post( __( 'The translation for this locale is incomplete. Help us get to 100%% by <a href="%s">contributing a translation</a>.', 'wp15' ) ),
+ esc_url( sprintf(
+ 'https://translate.wordpress.org/projects/meta/wp15/%s/default',
+ strtolower( str_replace( '_', '-', $current_locale ) )
+ ) )
+ );
+ ?>
+ </p>
+ <button type="button" class="wp15-locale-notice-dismiss">
+ <span class="screen-reader-text"><?php _e( 'Dismiss this notice.' ); ?></span>
+ </button>
+ </div>
+ <?php endif;
+}
</ins></span></pre></div>
<a id="sitestrunkwp15wordpressnetpublic_htmlcontentthemestwentyseventeenwp15headerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/header.php 2018-04-06 22:17:08 UTC (rev 7056)
+++ sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/header.php 2018-04-06 22:34:48 UTC (rev 7057)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,3 +42,5 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="site-content-contain">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="content" class="site-content">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ <?php Locales\locale_notice(); ?>
</ins></span></pre></div>
<a id="sitestrunkwp15wordpressnetpublic_htmlcontentthemestwentyseventeenwp15stylecss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/style.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/style.css 2018-04-06 22:17:08 UTC (rev 7056)
+++ sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/style.css 2018-04-06 22:34:48 UTC (rev 7057)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,6 +62,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> overflow: visible;
</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">+.site-header:before,
+.site-header:after {
+ content: none;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> @supports( display: grid ) {
</span><span class="cx" style="display: block; padding: 0 10px"> .site-header {
</span><span class="cx" style="display: block; padding: 0 10px"> display: grid;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,7 +306,66 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp15-locale-notice {
+ background: #fafafa;
+ margin-bottom: 5px;
+ padding: 1px 38px 1px 12px;
+ position: relative;
+ text-align: center;
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp15-locale-notice p {
+ margin: 0.5em 0;
+ padding: 2px;
+}
+
+.wp15-locale-notice-dismiss:before {
+ background: none;
+ color: #333;
+ content: "\f153";
+ display: block;
+ font: normal 16px/20px dashicons;
+ speak: none;
+ margin: 0.5em 0;
+ height: 20px;
+ text-align: center;
+ width: 20px;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.wp15-locale-notice-dismiss {
+ position: absolute;
+ top: 0;
+ right: 1px;
+ border: none;
+ margin: 0;
+ padding: 7px;
+ background: none;
+ color: #333;
+ cursor: pointer;
+}
+
+.wp15-locale-notice-dismiss:hover,
+.wp15-locale-notice-dismiss:active,
+.wp15-locale-notice-dismiss:focus {
+ background: inherit;
+}
+
+.wp15-locale-notice-dismiss:hover:before,
+.wp15-locale-notice-dismiss:active:before,
+.wp15-locale-notice-dismiss:focus:before {
+ color: #0073AA;
+}
+
+.wp15-locale-notice-dismiss:focus {
+ outline: none;
+}
+
+.ie8 .wp15-locale-notice-dismiss:focus {
+ outline: 1px solid #5b9dd9;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * About
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre>
</div>
</div>
</body>
</html>