<!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][989] trunk: Remove RRC format</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/989">989</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/989","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>nbachiyski</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-11-22 11:56:13 +0000 (Sat, 22 Nov 2014)</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'>Remove RRC format
The WordPress Blackberry app hasn't seen any development in the past year
and a half and this code has been a maintenance burden (recently some tests
failed).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpsettingsphp">trunk/gp-settings.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkgpincludesformatsformat_rrcphp">trunk/gp-includes/formats/format_rrc.php</a></li>
<li><a href="#trunktteststest_format_rrcphp">trunk/t/tests/test_format_rrc.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludesformatsformat_rrcphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/gp-includes/formats/format_rrc.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-includes/formats/format_rrc.php 2014-11-21 17:32:10 UTC (rev 988)
+++ trunk/gp-includes/formats/format_rrc.php 2014-11-22 11:56:13 UTC (rev 989)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,129 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class GP_Format_RRC extends GP_Format {
-
- public $name = 'Blackberry Resource (.rrc)';
- public $extension = 'rrc';
-
- public function print_exported_file( $project, $locale, $translation_set, $entries ) {
- $rrc = array();
- foreach( $entries as $entry ) {
- if ( !preg_match( '/^([A-Z0-9_]+)(?:\[(\d+)\])?$/', $entry->context, $matches ) ) {
- error_log( 'RRC Export: Bad Entry: '.$entry->context );
- continue;
- }
- $translation_with_original_fallback = gp_array_get( $entry->translations, 0, $entry->singular );
- if ( isset( $matches[2] ) ) {
- $key = $matches[1];
- $index = $matches[2];
- $rrc[$key][$index] = $translation_with_original_fallback;
- } else {
- $rrc[$entry->context] = $translation_with_original_fallback;
- }
- }
- $result = '';
- foreach( $rrc as $key => $translation ) {
- if ( !is_array( $translation ) ) {
- $result .= "$key#0=\"". $this->escape( $translation ) . "\";\n";
- } else {
- $result .= "$key#0={\n";
- foreach( $translation as $single_translation ) {
- $result .= "\t\"" . $this->escape( $single_translation ) . "\",\n";
- }
- $result .= "};\n";
- }
- }
- return $result;
- }
-
- public function read_originals_from_file( $file_name ) {
- $entries = new Translations;
- $f = fopen( $file_name, 'r' );
-
- if ( ! $f ) {
- return false;
- }
-
- $context = $index = $base_string_id = null;
-
- while ( false !== ( $line = fgets( $f ) ) ) {
- $line = trim( $line );
- if ( is_null( $context) ) {
- // single line entry
- if ( preg_match( '/^([A-Z0-9_]+)\#0\s*=\s*"(.*)";$/', $line, $matches ) ) {
- $entry = new Translation_Entry();
- $entry->context = $matches[1];
- $entry->singular = $this->unescape( $matches[2] );
- $entry->translations = array();
- $entries->add_entry( $entry );
- } elseif ( preg_match( '/^([A-Z0-9_]+)\#0\s*=\s*{$/', $line, $matches ) ) {
- $base_string_id = $matches[1];
- $context = 'inside-multiple';
- $index = 0;
- } else {
- error_log("Bad line: $line");
- return false;
- }
- } elseif ( 'inside-multiple' == $context ) {
- if ( '};' == $line ) {
- $context = null;
- } elseif ( preg_match( '/^"(.*)",$/', $line, $matches ) ) {
- $entry = new Translation_Entry;
- $entry->singular = $this->unescape( $matches[1] );
- $entry->context = $base_string_id . '[' . $index++ .']';
- $entry->translations = array();
- $entries->add_entry( $entry );
- } else {
- error_log("Bad multiple line: $line");
- return false;
- }
- }
- }
-
- return $entries;
- }
-
-
- /**
- * Escapes a UTF-8 string to be used in RRC file
- *
- * Suitable characters are encoded in ISO-8859-1, all non-latin1 unicode
- * characters are encoded via \uXXXX notation, where XXXX is 0-paded hex unicode code-point
- * Newlines, tabs and carriage returns are backslash-escaped.
- */
- private function escape( $string ) {
- $string = addcslashes( $string, "\"\n\t\r" );
- preg_match_all( '/./us', $string, $matches );
- $characters = $matches[0];
- $string = '';
- foreach( $characters as $c ) {
- if ( 1 == strlen( $c ) ) {
- $string .= $c;
- } else {
- if ( ( $c_latin1 = mb_convert_encoding( $c, 'ISO-8859-1', 'UTF-8' ) ) != '?' ) {
- $string .= $c_latin1;
- } else {
- $entity = mb_encode_numericentity( $c, array(0x0, 0xffff, 0, 0xffff), 'UTF-8' );
- $code_point = str_replace( array('&', '#', ';'), '', $entity );
- $string .= '\\u' . str_pad( strtoupper( dechex( $code_point ) ), 4, '0', STR_PAD_LEFT );
- }
- }
- }
- return $string;
- }
-
- /**
- * The reverse of {@see escape}
- */
- private function unescape( $string ) {
- // in the resource file all the strings should be in iso-8859-1
- $string = utf8_encode( $string );
- // except for the unicode code points like \uABCD
- $decode_codepoints_callback = lambda( '$m', 'html_entity_decode("&#x".$m[1].";", ENT_NOQUOTES, "UTF-8");' );
- $string = preg_replace_callback( '/\\\\u([a-fA-F0-9]{4})/', $decode_codepoints_callback, $string );
- return stripcslashes( $string );
- }
-
-}
-
-GP::$formats['rrc'] = new GP_Format_RRC;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="trunkgpsettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-settings.php 2014-11-21 17:32:10 UTC (rev 988)
+++ trunk/gp-settings.php 2014-11-22 11:56:13 UTC (rev 989)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,7 +322,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require_once GP_PATH . GP_INC . 'formats/format_android.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require_once GP_PATH . GP_INC . 'formats/format_pomo.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require_once GP_PATH . GP_INC . 'formats/format_resx.php';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-require_once GP_PATH . GP_INC . 'formats/format_rrc.php';
</del><span class="cx" style="display: block; padding: 0 10px"> require_once GP_PATH . GP_INC . 'formats/format_strings.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Let's do it again, there are more variables added since last time we called it
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -371,4 +370,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( GP_ROUTING ) {
</span><span class="cx" style="display: block; padding: 0 10px"> GP::$router->route();
</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="trunktteststest_format_rrcphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/t/tests/test_format_rrc.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/t/tests/test_format_rrc.php 2014-11-21 17:32:10 UTC (rev 988)
+++ trunk/t/tests/test_format_rrc.php 2014-11-22 11:56:13 UTC (rev 989)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,66 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-class GP_Test_Format_RRC extends GP_UnitTestCase {
- function setUp() {
- parent::setUp();
- $this->rrc = new GP_Format_RRC;
- $this->entries = array(
- array('WITH_LATIN1', 'for', 'für'),
- array('WITH_UNICODE_ESCAPES', 'baba', 'баба'),
- array('WITH_SLASHES', "twinkle\ntwinkle", "Twinkle,\nTwinkle,litle\tstar!"),
- array('MULTIPLE[0]', 'Off', 'Off'),
- array('MULTIPLE[1]', '1', '1'),
- array('MULTIPLE[2]', '2', '2'),
- array('MULTIPLE[3]', 'brun', "brun!\nbrun!"),
- array('UNTRANSLATED', 'English string', ''),
- array('MULTIPLE_UNTRANSLATED[0]', 'English string#0', 'Partly'),
- array('MULTIPLE_UNTRANSLATED[1]', 'English string#1', ''),
- );
- }
-
- function test_export() {
- $entries_for_export = array();
- foreach( $this->entries as $sample ) {
- list( $context, $original, $translation ) = $sample;
- $entries_for_export[] = (object)array(
- 'context' => $context,
- 'singular' => $original,
- 'translations' => $translation? array($translation) : array(),
- );
- }
- $this->assertDiscardWhitespace(
- file_get_contents( 'data/translation-exported.rrc' ),
- $this->rrc->print_exported_file( 'project', 'locale', 'translation_set', $entries_for_export )
- );
- }
-
- function test_read_originals() {
- $translations = $this->rrc->read_originals_from_file( 'data/originals.rrc' );
-
- foreach( $this->entries as $sample ) {
- list( $context, $original, $translation ) = $sample;
- $translatable_entry = new Translation_Entry( array('singular' => $original, 'context' => $context) );
- $entry = $translations->translate_entry( $translatable_entry );
- $this->assertEquals( $original, $entry->singular );
- $this->assertEquals( $context, $entry->context );
- }
- }
-
- function test_read_translations() {
- $stubbed_originals = array();
- foreach( $this->entries as $sample ) {
- list( $context, $original, $translation ) = $sample;
- $stubbed_originals[] = new GP_Original( array( 'singular' => $original, 'context' => $context ) );
- }
- GP::$original = $this->getMock( 'GP_Original', array('by_project_id') );
- GP::$original->expects( $this->once() )
- ->method( 'by_project_id' )
- ->with( $this->equalTo(2) )
- ->will( $this->returnValue($stubbed_originals) );
- $translations = $this->rrc->read_translations_from_file( 'data/translation.rrc', (object)array( 'id' => 2 ) );
- foreach( $this->entries as $sample ) {
- list( $context, $original, $translation ) = $sample;
- $this->assertEquals( $translation, $translations->translate( $original, $context ) );
- }
- }
-}
</del></span></pre>
</div>
</div>
</body>
</html>