<!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][718] trunk: Remove trailing whitespace, pass 2</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, #logmsg > ol { margin-left: 0; 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/718">718</a></dd>
<dt>Author</dt> <dd>nbachiyski</dd>
<dt>Date</dt> <dd>2012-10-31 00:32:02 +0000 (Wed, 31 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove trailing whitespace, pass 2</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludesadvancedpermissionsphp">trunk/gp-includes/advanced-permissions.php</a></li>
<li><a href="#trunkgpincludesassetsloaderphp">trunk/gp-includes/assets-loader.php</a></li>
<li><a href="#trunkgpincludesclassbpoptionsphp">trunk/gp-includes/class.bp-options.php</a></li>
<li><a href="#trunkgpincludescliphp">trunk/gp-includes/cli.php</a></li>
<li><a href="#trunkgpincludesformatsformat_androidphp">trunk/gp-includes/formats/format_android.php</a></li>
<li><a href="#trunkgpincludesformatsformat_pomophp">trunk/gp-includes/formats/format_pomo.php</a></li>
<li><a href="#trunkgpincludesformatsformat_resxphp">trunk/gp-includes/formats/format_resx.php</a></li>
<li><a href="#trunkgpincludesformatsformat_rrcphp">trunk/gp-includes/formats/format_rrc.php</a></li>
<li><a href="#trunkgpincludesformatsformat_stringsphp">trunk/gp-includes/formats/format_strings.php</a></li>
<li><a href="#trunkgpincludesinstallupgradephp">trunk/gp-includes/install-upgrade.php</a></li>
<li><a href="#trunkgpincludesl10nphp">trunk/gp-includes/l10n.php</a></li>
<li><a href="#trunkgpincludespluginphp">trunk/gp-includes/plugin.php</a></li>
<li><a href="#trunkgpincludesrouterphp">trunk/gp-includes/router.php</a></li>
<li><a href="#trunkgpincludesroutesloginphp">trunk/gp-includes/routes/login.php</a></li>
<li><a href="#trunkgpincludesroutesprojectphp">trunk/gp-includes/routes/project.php</a></li>
<li><a href="#trunkgpincludesroutestranslationsetphp">trunk/gp-includes/routes/translation-set.php</a></li>
<li><a href="#trunkgpincludesroutestranslationphp">trunk/gp-includes/routes/translation.php</a></li>
<li><a href="#trunkgpincludesschemaphp">trunk/gp-includes/schema.php</a></li>
<li><a href="#trunkgpincludesstringsphp">trunk/gp-includes/strings.php</a></li>
<li><a href="#trunkgpincludestemplatephp">trunk/gp-includes/template.php</a></li>
<li><a href="#trunkgpincludesthingspermissionphp">trunk/gp-includes/things/permission.php</a></li>
<li><a href="#trunkgpincludesthingsprojectphp">trunk/gp-includes/things/project.php</a></li>
<li><a href="#trunkgpincludesthingstranslationsetphp">trunk/gp-includes/things/translation-set.php</a></li>
<li><a href="#trunkgpincludesthingstranslationphp">trunk/gp-includes/things/translation.php</a></li>
<li><a href="#trunkgpincludesthingsuserphp">trunk/gp-includes/things/user.php</a></li>
<li><a href="#trunkgpincludesthingsvalidatorpermissionphp">trunk/gp-includes/things/validator-permission.php</a></li>
<li><a href="#trunkgpincludesvalidationphp">trunk/gp-includes/validation.php</a></li>
<li><a href="#trunkgploadphp">trunk/gp-load.php</a></li>
<li><a href="#trunkgptemplatesheaderphp">trunk/gp-templates/header.php</a></li>
<li><a href="#trunkgptemplateshelperfunctionsphp">trunk/gp-templates/helper-functions.php</a></li>
<li><a href="#trunkgptemplatesinstallphp">trunk/gp-templates/install.php</a></li>
<li><a href="#trunkgptemplatesloginphp">trunk/gp-templates/login.php</a></li>
<li><a href="#trunkgptemplatesprojectformphp">trunk/gp-templates/project-form.php</a></li>
<li><a href="#trunkgptemplatesprojectpermissionsphp">trunk/gp-templates/project-permissions.php</a></li>
<li><a href="#trunkgptemplatesprojectphp">trunk/gp-templates/project.php</a></li>
<li><a href="#trunkgptemplatestranslationrowphp">trunk/gp-templates/translation-row.php</a></li>
<li><a href="#trunkgptemplatestranslationsetformphp">trunk/gp-templates/translation-set-form.php</a></li>
<li><a href="#trunkgptemplatestranslationsphp">trunk/gp-templates/translations.php</a></li>
<li><a href="#trunklocaleslocalesphp">trunk/locales/locales.php</a></li>
<li><a href="#trunkpomoentryphp">trunk/pomo/entry.php</a></li>
<li><a href="#trunkpomomophp">trunk/pomo/mo.php</a></li>
<li><a href="#trunkpomopophp">trunk/pomo/po.php</a></li>
<li><a href="#trunkpomostreamsphp">trunk/pomo/streams.php</a></li>
<li><a href="#trunkpomotranslationsphp">trunk/pomo/translations.php</a></li>
<li><a href="#trunkscriptsaddadminphp">trunk/scripts/add-admin.php</a></li>
<li><a href="#trunkscriptsexportphp">trunk/scripts/export.php</a></li>
<li><a href="#trunkscriptsimportoriginalsphp">trunk/scripts/import-originals.php</a></li>
<li><a href="#trunkscriptsimportphp">trunk/scripts/import.php</a></li>
<li><a href="#trunkscriptsrecheckwarningsphp">trunk/scripts/recheck-warnings.php</a></li>
<li><a href="#trunkscriptsregeneratepathsphp">trunk/scripts/regenerate-paths.php</a></li>
<li><a href="#trunkscriptsremovemultiplecurrentsphp">trunk/scripts/remove-multiple-currents.php</a></li>
<li><a href="#trunkscriptsupgradesetpermissionsphp">trunk/scripts/upgrade-set-permissions.php</a></li>
<li><a href="#trunkscriptswipepermissionsphp">trunk/scripts/wipe-permissions.php</a></li>
<li><a href="#trunkscriptswporg2slugphp">trunk/scripts/wporg2slug.php</a></li>
<li><a href="#trunktallphp">trunk/t/all.php</a></li>
<li><a href="#trunktlibfactoryphp">trunk/t/lib/factory.php</a></li>
<li><a href="#trunktlibtestcaseroutephp">trunk/t/lib/testcase-route.php</a></li>
<li><a href="#trunktlibtestcasephp">trunk/t/lib/testcase.php</a></li>
<li><a href="#trunkttest_format_androidphp">trunk/t/test_format_android.php</a></li>
<li><a href="#trunkttest_format_resxphp">trunk/t/test_format_resx.php</a></li>
<li><a href="#trunkttest_format_rrcphp">trunk/t/test_format_rrc.php</a></li>
<li><a href="#trunkttest_linksphp">trunk/t/test_links.php</a></li>
<li><a href="#trunkttest_miscphp">trunk/t/test_misc.php</a></li>
<li><a href="#trunkttest_mophp">trunk/t/test_mo.php</a></li>
<li><a href="#trunkttest_noop_translationsphp">trunk/t/test_noop_translations.php</a></li>
<li><a href="#trunkttest_permissionsphp">trunk/t/test_permissions.php</a></li>
<li><a href="#trunkttest_pophp">trunk/t/test_po.php</a></li>
<li><a href="#trunkttest_templatephp">trunk/t/test_template.php</a></li>
<li><a href="#trunkttest_thingphp">trunk/t/test_thing.php</a></li>
<li><a href="#trunkttest_translation_entryphp">trunk/t/test_translation_entry.php</a></li>
<li><a href="#trunkttest_translationsphp">trunk/t/test_translations.php</a></li>
<li><a href="#trunkttest_urlsphp">trunk/t/test_urls.php</a></li>
<li><a href="#trunkttest_userphp">trunk/t/test_user.php</a></li>
<li><a href="#trunkttests_routestest_route_translation_setphp">trunk/t/tests_routes/test_route_translation_set.php</a></li>
<li><a href="#trunkttests_testlibtest_default_factoriesphp">trunk/t/tests_testlib/test_default_factories.php</a></li>
<li><a href="#trunkttests_testlibtest_factoryphp">trunk/t/tests_testlib/test_factory.php</a></li>
<li><a href="#trunkttests_thingstest_thing_originalphp">trunk/t/tests_things/test_thing_original.php</a></li>
<li><a href="#trunkttests_thingstest_thing_projectphp">trunk/t/tests_things/test_thing_project.php</a></li>
<li><a href="#trunkttests_thingstest_thing_translationphp">trunk/t/tests_things/test_thing_translation.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludesadvancedpermissionsphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/advanced-permissions.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/advanced-permissions.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/advanced-permissions.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> $set = GP::$translation_set->get( $args['object_id'] );
</span><span class="cx"> return $args['user']->can( 'approve', GP::$validator_permission->object_type,
</span><span class="cx"> GP::$validator_permission->object_id( $set->project_id, $set->locale, $set->slug ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> add_filter( 'can_user', 'gp_recurse_project_permissions', 10, 2 );
</span></span></pre></div>
<a id="trunkgpincludesassetsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/assets-loader.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/assets-loader.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/assets-loader.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> // TODO: get text direction for current locale
</span><span class="cx"> //$styles->text_direction = 'rtl' == get_bloginfo( 'text_direction' ) ? 'rtl' : 'ltr';
</span><span class="cx"> $styles->text_direction = 'ltr';
</span><del>-
</del><ins>+
</ins><span class="cx"> $styles->add( 'base', '/style.css', array(), '20120410' );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkgpincludesclassbpoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/class.bp-options.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/class.bp-options.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/class.bp-options.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> function prefix() {
</span><span class="cx"> return 'bp_glotpress_';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function get($option) {
</span><span class="cx"> switch ($option) {
</span><span class="cx"> case 'application_id':
</span><span class="lines">@@ -38,15 +38,15 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function add($option, $value) {
</span><span class="cx"> return BP_Options::update($option, $value);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function update($option, $value) {
</span><span class="cx"> return bb_update_option(BP_Options::prefix() . $option, $value);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function delete($option) {
</span><span class="cx"> return bb_delete_option(BP_Options::prefix() . $option);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkgpincludescliphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/cli.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/cli.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/cli.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -1,11 +1,11 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> class GP_CLI {
</span><del>-
</del><ins>+
</ins><span class="cx"> var $short_options = '';
</span><span class="cx"> var $program_name = '';
</span><span class="cx"> var $usage = '';
</span><del>-
</del><ins>+
</ins><span class="cx"> function __construct() {
</span><span class="cx"> global $argv;
</span><span class="cx"> if ( gp_array_get( $_SERVER, 'HTTP_HOST' ) ) {
</span><span class="lines">@@ -14,21 +14,21 @@
</span><span class="cx"> if ( !defined( 'STDERR' ) ) {
</span><span class="cx"> define( 'STDERR', fopen( 'php://stderr', 'w' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $this->program_name = array_shift( $argv );
</span><span class="cx"> $this->options = getopt( $this->short_options );
</span><span class="cx"> $this->args = $argv;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function usage() {
</span><span class="cx"> $this->error( 'php '.$this->program_name.' '.$this->usage );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function to_stderr( $text, $no_new_line = false ) {
</span><span class="cx"> $text .= ($no_new_line? '' : "\n");
</span><span class="cx"> fwrite( STDERR, $text );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function error( $message, $exit_code = 1 ) {
</span><span class="cx"> $this->to_stderr( $message );
</span><span class="cx"> exit( $exit_code );
</span><span class="lines">@@ -36,29 +36,29 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class GP_Translation_Set_Script extends GP_CLI {
</span><del>-
</del><ins>+
</ins><span class="cx"> var $short_options = 'p:l:t:';
</span><del>-
</del><ins>+
</ins><span class="cx"> var $usage = "-p <project-path> -l <locale> [-t <translation-set-slug>]";
</span><del>-
</del><ins>+
</ins><span class="cx"> function run() {
</span><span class="cx"> if ( !isset( $this->options['l'] ) || !isset( $this->options['p'] ) ) {
</span><span class="cx"> $this->usage();
</span><span class="cx"> }
</span><span class="cx"> $this->project = GP::$project->by_path( $this->options['p'] );
</span><span class="cx"> if ( !$this->project ) $this->error( __('Project not found!') );
</span><del>-
</del><ins>+
</ins><span class="cx"> $this->locale = GP_Locales::by_slug( $this->options['l'] );
</span><span class="cx"> if ( !$this->locale ) $this->error( __('Locale not found!') );
</span><del>-
</del><ins>+
</ins><span class="cx"> $this->options['t'] = gp_array_get( $this->options, 't', 'default' );
</span><del>-
</del><ins>+
</ins><span class="cx"> $this->translation_set = GP::$translation_set->by_project_id_slug_and_locale( $this->project->id, $this->options['t'], $this->locale->slug );
</span><span class="cx"> if ( !$this->translation_set ) $this->error( __('Translation set not found!') );
</span><span class="cx">
</span><span class="cx"> $this->action_on_translation_set( $this->translation_set );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function action_on_translation_set( $translation_set ) {
</span><span class="cx"> // define this function in a subclass
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkgpincludesformatsformat_androidphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/formats/format_android.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/formats/format_android.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/formats/format_android.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -1,15 +1,15 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> class GP_Format_Android {
</span><del>-
</del><ins>+
</ins><span class="cx"> var $extension = 'xml';
</span><del>-
</del><ins>+
</ins><span class="cx"> var $exported = '';
</span><del>-
</del><ins>+
</ins><span class="cx"> function line( $string, $prepend_tabs = 0 ) {
</span><span class="cx"> $this->exported .= str_repeat( "\t", $prepend_tabs ) . "$string\n";
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function print_exported_file( $project, $locale, $translation_set, $entries ) {
</span><span class="cx"> $this->exported = '';
</span><span class="cx"> $this->line( '<?xml version="1.0" encoding="utf-8"?>' );
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> $this->line( '</resources>' );
</span><span class="cx"> return $this->exported;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function read_translations_from_file( $file_name, $project = null ) {
</span><span class="cx"> if ( is_null( $project ) ) return false;
</span><span class="cx"> $translations = $this->read_originals_from_file( $file_name );
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> $new_translations = new Translations;
</span><span class="cx"> foreach( $translations->entries as $key => $entry ) {
</span><span class="cx"> // we have been using read_originals_from_file to parse the file
</span><del>- // so we need to swap singular and translation
</del><ins>+ // so we need to swap singular and translation
</ins><span class="cx"> $entry->translations = array( $entry->singular );
</span><span class="cx"> $entry->singular = null;
</span><span class="cx"> foreach( $originals as $original ) {
</span><span class="lines">@@ -46,11 +46,11 @@
</span><span class="cx"> error_log( sprintf( __("Missing context %s in project #%d"), $entry->context, $project->id ) );
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $new_translations->add_entry( $entry );
</span><span class="cx"> }
</span><span class="cx"> return $new_translations;
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function read_originals_from_file( $file_name ) {
</span><span class="lines">@@ -69,11 +69,11 @@
</span><span class="cx"> return $entries;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><ins>+
</ins><span class="cx"> function unescape( $string ) {
</span><del>- return stripcslashes( $string );
</del><ins>+ return stripcslashes( $string );
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function escape( $string ) {
</span><span class="cx"> $string = addcslashes( $string, "'\n");
</span><span class="cx"> $string = str_replace( array( '&', '<' ), array( '&amp;', '&lt;' ), $string );
</span></span></pre></div>
<a id="trunkgpincludesformatsformat_pomophp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/formats/format_pomo.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/formats/format_pomo.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/formats/format_pomo.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -1,10 +1,10 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> class GP_Format_PO {
</span><del>-
</del><ins>+
</ins><span class="cx"> var $extension = 'po';
</span><span class="cx"> var $class = 'PO';
</span><del>-
</del><ins>+
</ins><span class="cx"> function print_exported_file( $project, $locale, $translation_set, $entries ) {
</span><span class="cx"> $po = new $this->class;
</span><span class="cx"> // TODO: add more meta data in the project: language team, report URL
</span><span class="lines">@@ -30,13 +30,13 @@
</span><span class="cx">
</span><span class="cx"> echo $po->export();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function read_translations_from_file( $file_name, $project = null ) {
</span><span class="cx"> $po = new $this->class;
</span><span class="cx"> $result = $po->import_from_file( $file_name );
</span><span class="cx"> return $result? $po : $result;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function read_originals_from_file( $file_name ) {
</span><span class="cx"> return $this->read_translations_from_file( $file_name );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkgpincludesformatsformat_resxphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/formats/format_resx.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/formats/format_resx.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/formats/format_resx.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -1,21 +1,21 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> class GP_Format_ResX {
</span><del>-
</del><ins>+
</ins><span class="cx"> var $extension = 'resx.xml';
</span><del>-
</del><ins>+
</ins><span class="cx"> var $exported = '';
</span><del>-
</del><ins>+
</ins><span class="cx"> function line( $string, $prepend_tabs = 0 ) {
</span><span class="cx"> $this->exported .= str_repeat( "\t", $prepend_tabs ) . "$string\n";
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function res_header( $name, $value ) {
</span><span class="cx"> $this->line( '<resheader name="'.$name.'">', 1 );
</span><span class="cx"> $this->line( '<value>'.$value.'</value>', 2 );
</span><del>- $this->line( '</resheader>', 1 );
</del><ins>+ $this->line( '</resheader>', 1 );
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function print_exported_file( $project, $locale, $translation_set, $entries ) {
</span><span class="cx"> $this->exported = '';
</span><span class="cx"> $this->line( '<?xml version="1.0" encoding="utf-8"?>' );
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> $this->line( '</root>' );
</span><span class="cx"> return $this->exported;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function read_translations_from_file( $file_name, $project = null ) {
</span><span class="cx"> if ( is_null( $project ) ) return false;
</span><span class="cx"> $translations = $this->read_originals_from_file( $file_name );
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> $new_translations = new Translations;
</span><span class="cx"> foreach( $translations->entries as $key => $entry ) {
</span><span class="cx"> // we have been using read_originals_from_file to parse the file
</span><del>- // so we need to swap singular and translation
</del><ins>+ // so we need to swap singular and translation
</ins><span class="cx"> $entry->translations = array( $entry->singular );
</span><span class="cx"> $entry->singular = null;
</span><span class="cx"> foreach( $originals as $original ) {
</span><span class="lines">@@ -61,11 +61,11 @@
</span><span class="cx"> error_log( sprintf( __("Missing context %s in project #%d"), $entry->context, $project->id ) );
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $new_translations->add_entry( $entry );
</span><span class="cx"> }
</span><span class="cx"> return $new_translations;
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function read_originals_from_file( $file_name ) {
</span><span class="lines">@@ -90,11 +90,11 @@
</span><span class="cx"> return $entries;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><ins>+
</ins><span class="cx"> function unescape( $string ) {
</span><span class="cx"> return $string;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function escape( $string ) {
</span><span class="cx"> $string = str_replace( array( '&', '<' ), array( '&amp;', '&lt;' ), $string );
</span><span class="cx"> return $string;
</span></span></pre></div>
<a id="trunkgpincludesformatsformat_rrcphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/formats/format_rrc.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/formats/format_rrc.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/formats/format_rrc.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> class GP_Format_RRC {
</span><del>-
</del><ins>+
</ins><span class="cx"> var $extension = 'rrc';
</span><del>-
</del><ins>+
</ins><span class="cx"> function print_exported_file( $project, $locale, $translation_set, $entries ) {
</span><span class="cx"> $rrc = array();
</span><span class="cx"> foreach( $entries as $entry ) {
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> }
</span><span class="cx"> return $result;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function read_translations_from_file( $file_name, $project = null ) {
</span><span class="cx"> if ( is_null( $project ) ) return false;
</span><span class="cx"> $translations = $this->read_originals_from_file( $file_name );
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> $new_translations = new Translations;
</span><span class="cx"> foreach( $translations->entries as $key => $entry ) {
</span><span class="cx"> // we have been using read_originals_from_file to parse the file
</span><del>- // so we need to swap singular and translation
</del><ins>+ // so we need to swap singular and translation
</ins><span class="cx"> $entry->translations = array( $entry->singular );
</span><span class="cx"> $entry->singular = null;
</span><span class="cx"> foreach( $originals as $original ) {
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> error_log( sprintf( __("Missing context %s in project #%d"), $entry->context, $project->id ) );
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $new_translations->add_entry( $entry );
</span><span class="cx"> }
</span><span class="cx"> return $new_translations;
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> $entries = new Translations;
</span><span class="cx"> $f = fopen( $file_name, 'r' );
</span><span class="cx"> if ( !$f ) return false;
</span><del>- $context = $index = $base_singular = $entry = null;
</del><ins>+ $context = $index = $base_singular = $entry = null;
</ins><span class="cx"> while ( false !== ( $line = fgets( $f ) ) ) {
</span><span class="cx"> $line = trim( $line );
</span><span class="cx"> if ( is_null( $context) ) {
</span><span class="lines">@@ -100,10 +100,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- return $entries;
</del><ins>+ return $entries;
</ins><span class="cx"> }
</span><del>-
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Escapes a UTF-8 string to be used in RRC file
</span><span class="cx"> *
</span><span class="lines">@@ -124,14 +124,14 @@
</span><span class="cx"> $string .= $c_latin1;
</span><span class="cx"> } else {
</span><span class="cx"> $entity = mb_encode_numericentity( $c, array(0x0, 0xffff, 0, 0xffff), 'UTF-8' );
</span><del>- $code_point = str_replace( array('&', '#', ';'), '', $entity );
</del><ins>+ $code_point = str_replace( array('&', '#', ';'), '', $entity );
</ins><span class="cx"> $string .= '\\u' . str_pad( strtoupper( dechex( $code_point ) ), 4, '0', STR_PAD_LEFT );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return $string;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * The reverse of {@see escape}
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkgpincludesformatsformat_stringsphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/formats/format_strings.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/formats/format_strings.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/formats/format_strings.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -1,22 +1,22 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> class GP_Format_Strings {
</span><del>-
</del><ins>+
</ins><span class="cx"> var $extension = 'strings';
</span><del>-
</del><ins>+
</ins><span class="cx"> var $exported = '';
</span><del>-
</del><ins>+
</ins><span class="cx"> function sort_entries( $a, $b ) {
</span><span class="cx"> if ( $a->context == $b->context ) {
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx"> return ( $a->context > $b->context ) ? +1 : -1;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function print_exported_file( $project, $locale, $translation_set, $entries ) {
</span><span class="cx"> $result = '';
</span><span class="cx"> $prefix = pack( 'CC', 0xff, 0xfe ); // Add BOM
</span><del>-
</del><ins>+
</ins><span class="cx"> $sorted_entries = $entries;
</span><span class="cx"> usort( $sorted_entries, array( 'GP_Format_Strings', 'sort_entries' ) );
</span><span class="cx"> foreach ( $sorted_entries as $entry ) {
</span><span class="lines">@@ -28,10 +28,10 @@
</span><span class="cx"> }
</span><span class="cx"> $result .= "/* $comment */\n\"$original\" = \"$translation\";\n\n";
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return $prefix . mb_convert_encoding( $result, 'UTF-16LE' );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function read_translations_from_file( $file_name, $project = null ) {
</span><span class="cx"> if ( is_null( $project ) ) return false;
</span><span class="cx"> $translations = $this->read_originals_from_file( $file_name );
</span><span class="lines">@@ -40,11 +40,11 @@
</span><span class="cx"> $new_translations = new Translations;
</span><span class="cx"> foreach( $translations->entries as $key => $entry ) {
</span><span class="cx"> // we have been using read_originals_from_file to parse the file
</span><del>- // so we need to swap singular and translation
</del><ins>+ // so we need to swap singular and translation
</ins><span class="cx"> if ( $entry->context == $entry->singular ) {
</span><span class="cx"> $entry->translations = array();
</span><span class="cx"> } else {
</span><del>- $entry->translations = array( $entry->singular );
</del><ins>+ $entry->translations = array( $entry->singular );
</ins><span class="cx"> }
</span><span class="cx"> $entry->singular = null;
</span><span class="cx"> foreach( $originals as $original ) {
</span><span class="lines">@@ -57,11 +57,11 @@
</span><span class="cx"> error_log( sprintf( __("Missing context %s in project #%d"), $entry->context, $project->id ) );
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $new_translations->add_entry( $entry );
</span><span class="cx"> }
</span><span class="cx"> return $new_translations;
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function read_originals_from_file( $file_name ) {
</span><span class="lines">@@ -102,11 +102,11 @@
</span><span class="cx"> return $entries;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><ins>+
</ins><span class="cx"> function unescape( $string ) {
</span><del>- return stripcslashes( $string );
</del><ins>+ return stripcslashes( $string );
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function escape( $string ) {
</span><span class="cx"> $string = addcslashes( $string, "'\n");
</span><span class="cx"> return $string;
</span></span></pre></div>
<a id="trunkgpincludesinstallupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/install-upgrade.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/install-upgrade.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/install-upgrade.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -21,12 +21,12 @@
</span><span class="cx">
</span><span class="cx"> function gp_upgrade_db() {
</span><span class="cx"> global $gpdb;
</span><del>-
</del><ins>+
</ins><span class="cx"> $alterations = BP_SQL_Schema_Parser::delta( $gpdb, gp_schema_get() );
</span><span class="cx"> $messages = $alterations['messages'];
</span><span class="cx"> $errors = $alterations['errors'];
</span><span class="cx"> if ( $errors ) return $errors;
</span><del>-
</del><ins>+
</ins><span class="cx"> gp_upgrade_data( gp_get_option_from_db( 'gp_db_version' ) );
</span><span class="cx">
</span><span class="cx"> gp_update_db_version();
</span><span class="lines">@@ -49,18 +49,18 @@
</span><span class="cx"> $errors = gp_upgrade_db();
</span><span class="cx">
</span><span class="cx"> if ( $errors ) return $errors;
</span><del>-
</del><ins>+
</ins><span class="cx"> gp_update_option( 'uri', guess_uri() );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function gp_create_initial_contents() {
</del><ins>+function gp_create_initial_contents() {
</ins><span class="cx"> global $gpdb;
</span><span class="cx"> $gpdb->insert( $gpdb->projects, array('name' => __('Sample'), 'slug' => __('sample'), 'description' => __('A Sample Project'), 'path' => __('sample') ) );
</span><span class="cx"> $gpdb->insert( $gpdb->originals, array('project_id' => 1, 'singular' => __('GlotPress FTW'), 'comment' => __('FTW means For The Win'), 'context' => 'dashboard', 'references' => 'bigfile:666 little-dir/small-file.php:71' ) );
</span><span class="cx"> $gpdb->insert( $gpdb->originals, array('project_id' => 1, 'singular' => __('A GlotPress'), 'plural' => __('Many GlotPresses') ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> $gpdb->insert( $gpdb->translation_sets, array( 'name' => __('My Translation'), 'slug' => __('my'), 'project_id' => 1, 'locale' => 'bg', ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> // TODO: ask the user for an e-mail -- borrow WordPress install process
</span><span class="cx"> if ( !defined('CUSTOM_USER_TABLE') ) {
</span><span class="cx"> $admin = GP::$user->create( array( 'user_login' => 'admin', 'user_pass' => 'a', 'user_email' => 'baba@baba.net' ) );
</span></span></pre></div>
<a id="trunkgpincludesl10nphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/l10n.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/l10n.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/l10n.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> // GP_LANG is defined in gp-config.
</span><span class="cx"> if ( defined('GP_LANG') )
</span><span class="cx"> $locale = GP_LANG;
</span><del>-
</del><ins>+
</ins><span class="cx"> // TODO: get locale from DB
</span><span class="cx">
</span><span class="cx"> if (empty($locale))
</span><span class="lines">@@ -90,13 +90,13 @@
</span><span class="cx"> global $l10n;
</span><span class="cx">
</span><span class="cx"> if ( !is_readable( $mofile ) ) return;
</span><del>-
</del><ins>+
</ins><span class="cx"> $mo = new MO();
</span><span class="cx"> $mo->import_from_file( $mofile );
</span><span class="cx">
</span><span class="cx"> if ( isset( $l10n [$domain] ) )
</span><span class="cx"> $mo->merge_with( $l10n[$domain] );
</span><del>-
</del><ins>+
</ins><span class="cx"> $l10n[$domain] = &$mo;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkgpincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/plugin.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/plugin.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/plugin.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -9,20 +9,20 @@
</span><span class="cx"> * @var $id unique id of the plugin. It will be used as a plugin slug in the plugin repository
</span><span class="cx"> */
</span><span class="cx"> var $id;
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * If you override the constructor, always call the parent one.
</span><span class="cx"> */
</span><span class="cx"> function __construct() {
</span><span class="cx"> $this->_object_type = 'plugin_'.$this->id;
</span><span class="cx"> }
</span><del>-
-
</del><ins>+
+
</ins><span class="cx"> /**
</span><span class="cx"> * Retrieve an option, specific to your plugin.
</span><span class="cx"> *
</span><span class="cx"> * You don't have to prefix the key or to tie its name to your plugin.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $key
</span><span class="cx"> * @return mixed the value of the option, or null if it wasn't found
</span><span class="cx"> */
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> }
</span><span class="cx"> return $r;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Update an option, specific to your plugin.
</span><span class="cx"> *
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> function update_option( $key, $value ) {
</span><span class="cx"> return gp_update_meta( 0, $key, $value, $this->_object_type, true );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Adds a method in this class as an action with the same name.
</span><span class="cx"> *
</span><span class="lines">@@ -89,11 +89,11 @@
</span><span class="cx"> $args = array_merge( $defaults, $args );
</span><span class="cx"> return $wp_function( $args['tag'], array( &$this, $args['tag'] ), $args['priority'], $args['args'] );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function remove_action( $action_name, $args = array() ) {
</span><span class="cx"> return $this->remove_filter( $action_name, $args );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function remove_filter( $filter_name, $args = array() ) {
</span><span class="cx"> return $this->_call_wp_plugin_api_function( 'remove_filter', $filter_name, $args );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkgpincludesrouterphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/router.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/router.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/router.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -3,14 +3,14 @@
</span><span class="cx"> class GP_Router {
</span><span class="cx">
</span><span class="cx"> var $api_prefix = 'api';
</span><del>-
</del><ins>+
</ins><span class="cx"> function __construct( $urls = null ) {
</span><span class="cx"> if ( is_null( $urls ) )
</span><span class="cx"> $this->urls = $this->default_routes();
</span><span class="cx"> else
</span><span class="cx"> $this->urls = $urls;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Returns the current request URI path, relative to
</span><span class="cx"> * the application URI and without the query string
</span><span class="lines">@@ -21,15 +21,15 @@
</span><span class="cx"> return urldecode( $match[1] );
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function request_method() {
</span><span class="cx"> return gp_array_get( $_SERVER, 'REQUEST_METHOD', 'GET' );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function add( $re, $function, $method = 'get' ) {
</span><span class="cx"> $this->urls["$method:$re"] = $function;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function default_routes() {
</span><span class="cx"> $dir = '([^_/][^/]*)';
</span><span class="cx"> $path = '(.+?)';
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> 'get:/login' => array('GP_Route_Login', 'login_get'),
</span><span class="cx"> 'post:/login' => array('GP_Route_Login', 'login_post'),
</span><span class="cx"> 'get:/logout' => array('GP_Route_Login', 'logout'),
</span><del>-
</del><ins>+
</ins><span class="cx"> 'get:/profile' => array('GP_Route_Profile', 'profile_get'),
</span><span class="cx"> 'post:/profile' => array('GP_Route_Profile', 'profile_post'),
</span><span class="cx">
</span><span class="lines">@@ -58,16 +58,16 @@
</span><span class="cx"> "post:/$project/-delete" => array('GP_Route_Project', 'delete_post'),
</span><span class="cx">
</span><span class="cx"> "post:/$project/-personal" => array('GP_Route_Project', 'personal_options_post'),
</span><del>-
</del><ins>+
</ins><span class="cx"> "get:/$project/-permissions" => array('GP_Route_Project', 'permissions_get'),
</span><span class="cx"> "post:/$project/-permissions" => array('GP_Route_Project', 'permissions_post'),
</span><span class="cx"> "get:/$project/-permissions/-delete/$dir" => array('GP_Route_Project', 'permissions_delete'),
</span><del>-
</del><ins>+
</ins><span class="cx"> "get:/$project/-mass-create-sets" => array('GP_Route_Project', 'mass_create_sets_get'),
</span><span class="cx"> "post:/$project/-mass-create-sets" => array('GP_Route_Project', 'mass_create_sets_post'),
</span><span class="cx"> "post:/$project/-mass-create-sets/preview" => array('GP_Route_Project', 'mass_create_sets_preview_post'),
</span><del>-
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> "get:/$projects" => array('GP_Route_Project', 'index'),
</span><span class="cx"> "get:/$projects/-new" => array('GP_Route_Project', 'new_get'),
</span><span class="cx"> "post:/$projects/-new" => array('GP_Route_Project', 'new_post'),
</span><span class="lines">@@ -89,12 +89,12 @@
</span><span class="cx"> "get:/sets/$id" => array('GP_Route_Translation_Set', 'single'),
</span><span class="cx"> "get:/sets/$id/-edit" => array('GP_Route_Translation_Set', 'edit_get'),
</span><span class="cx"> "post:/sets/$id/-edit" => array('GP_Route_Translation_Set', 'edit_post'),
</span><del>-
</del><ins>+
</ins><span class="cx"> "post:/originals/$id/set_priority" => array('GP_Route_Original', 'set_priority'),
</span><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><ins>+
</ins><span class="cx"> function route() {
</span><span class="cx"> $real_request_uri = $this->request_uri();
</span><span class="cx"> $api_request_uri = $real_request_uri;
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> foreach( $this->urls as $re => $func ) {
</span><span class="cx"> foreach (array('get', 'post', 'head', 'put', 'delete') as $http_method) {
</span><span class="cx"> if ( gp_startswith( $re, $http_method.':' ) ) {
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $http_method != $request_method ) continue;
</span><span class="cx"> $re = substr( $re, strlen( $http_method . ':' ));
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkgpincludesroutesloginphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/routes/login.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/routes/login.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/routes/login.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -7,18 +7,18 @@
</span><span class="cx"> }
</span><span class="cx"> gp_tmpl_load( 'login', array() );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function login_post() {
</span><span class="cx"> global $wp_users_object, $wp_auth_object;
</span><del>-
</del><ins>+
</ins><span class="cx"> $user = GP::$user->by_login( $_POST['user_login'] );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !$user || is_wp_error($user) ) {
</span><span class="cx"> $this->errors[] = __("Invalid username!");
</span><span class="cx"> $this->redirect( gp_url_login() );
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $user->login( gp_post( 'user_pass' ) ) ) {
</span><span class="cx"> if ( gp_post( 'redirect_to' ) ) {
</span><span class="cx"> $this->redirect( gp_post( 'redirect_to' ) );
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> $this->redirect( gp_url_login() );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function logout() {
</span><span class="cx"> GP::$user->logout();
</span><span class="cx"> $this->redirect( gp_url( '/' ) );
</span></span></pre></div>
<a id="trunkgpincludesroutesprojectphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/routes/project.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/routes/project.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/routes/project.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -1,12 +1,12 @@
</span><span class="cx"> <?php
</span><span class="cx"> class GP_Route_Project extends GP_Route_Main {
</span><del>-
</del><ins>+
</ins><span class="cx"> function index() {
</span><span class="cx"> $title = __('Projects');
</span><span class="cx"> $projects = GP::$project->top_level();
</span><span class="cx"> $this->tmpl( 'projects', get_defined_vars() );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function single( $project_path ) {
</span><span class="cx"> $project = GP::$project->by_path( $project_path );
</span><span class="cx"> if ( !$project ) gp_tmpl_404();
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> $can_write = $this->can( 'write', 'project', $project->id );
</span><span class="cx"> $this->tmpl( 'project', get_defined_vars() );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function personal_options_post( $project_path ) {
</span><span class="cx"> $project = GP::$project->by_path( $project_path );
</span><span class="cx"> if ( !$project ) gp_tmpl_404();
</span><span class="lines">@@ -71,10 +71,10 @@
</span><span class="cx"> if ( !$translations ) {
</span><span class="cx"> $this->redirect_with_error( __('Couldn&#8217;t load translations from file!') );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> list( $originals_added, $originals_existing ) = GP::$original->import_for_project( $project, $translations );
</span><span class="cx"> $this->notices[] = sprintf(__("%s new strings were added, %s existing were updated."), $originals_added, $originals_existing );
</span><del>-
</del><ins>+
</ins><span class="cx"> $this->redirect( gp_url_project( $project, 'import-originals' ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> if ( $this->cannot_and_redirect( 'write', 'project', $project->id ) ) return;
</span><span class="cx"> gp_tmpl_load( 'project-edit', get_defined_vars() );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function edit_post( $project_path ) {
</span><span class="cx"> $project = GP::$project->by_path( $project_path );
</span><span class="cx"> if ( !$project ) gp_tmpl_404();
</span><span class="lines">@@ -117,14 +117,14 @@
</span><span class="cx"> $this->redirect( gp_url_project( '' ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><ins>+
</ins><span class="cx"> function new_get() {
</span><span class="cx"> $project = new GP_Project();
</span><span class="cx"> $project->parent_project_id = gp_get( 'parent_project_id', null );
</span><span class="cx"> if ( $this->cannot_and_redirect( 'write', 'project', $project->parent_project_id ) ) return;
</span><span class="cx"> gp_tmpl_load( 'project-new', get_defined_vars() );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function new_post() {
</span><span class="cx"> $post = gp_post( 'project' );
</span><span class="cx"> $parent_project_id = gp_array_get( $post, 'parent_project_id', null );
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> $this->redirect( gp_url_project( $project ) );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function permissions_get( $project_path ) {
</span><span class="cx"> $project = GP::$project->by_path( $project_path );
</span><span class="cx"> if ( !$project ) gp_tmpl_404();
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> }
</span><span class="cx"> $this->redirect( gp_url_current() );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function permissions_delete( $project_path, $permission_id ) {
</span><span class="cx"> $project = GP::$project->by_path( $project_path );
</span><span class="cx"> if ( !$project ) gp_tmpl_404();
</span><span class="lines">@@ -249,5 +249,5 @@
</span><span class="cx"> }
</span><span class="cx"> header('Content-Type: application/json');
</span><span class="cx"> echo json_encode( $project->set_difference_from( $other_project ) );
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkgpincludesroutestranslationsetphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/routes/translation-set.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/routes/translation-set.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/routes/translation-set.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> if ( $this->cannot_edit_set_and_redirect( $set ) ) return;
</span><span class="cx"> $this->tmpl( 'translation-set-new', get_defined_vars() );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function new_post() {
</span><span class="cx"> $new_set = new GP_Translation_Set( gp_post( 'set', array() ) );
</span><span class="cx"> if ( $this->cannot_edit_set_and_redirect( $new_set ) ) return;
</span><span class="lines">@@ -22,14 +22,14 @@
</span><span class="cx"> $this->redirect( gp_url_project_locale( GP::$project->get( $created_set->project_id ), $created_set->locale, $created_set->slug ) );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function single( $set_id ) {
</span><span class="cx"> $items = $this->get_set_project_and_locale_from_set_id_or_404( $set_id );
</span><span class="cx"> if ( !$items) return;
</span><span class="cx"> list( $set, $project, $locale ) = $items;
</span><span class="cx"> $this->redirect( gp_url_project( $project, array( $set->locale, $set->slug ) ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function edit_get( $set_id ) {
</span><span class="cx"> $items = $this->get_set_project_and_locale_from_set_id_or_404( $set_id );
</span><span class="cx"> if ( !$items ) return;
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> $url = gp_url_project( $project, gp_url_join( $set->locale, $set->slug ) );
</span><span class="cx"> $this->tmpl( 'translation-set-edit', get_defined_vars() );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function edit_post( $set_id ) {
</span><span class="cx"> $items = $this->get_set_project_and_locale_from_set_id_or_404( $set_id );
</span><span class="cx"> if ( !$items ) return;
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> private function cannot_edit_set_and_redirect( $set ) {
</span><span class="cx"> return $this->cannot_and_redirect( 'write', 'project', $set->project_id );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> private function get_set_project_and_locale_from_set_id_or_404( $set_id ) {
</span><span class="cx"> $set = GP::$translation_set->get( $set_id );
</span><span class="cx"> if ( !$set ) {
</span></span></pre></div>
<a id="trunkgpincludesroutestranslationphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/routes/translation.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/routes/translation.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/routes/translation.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -36,10 +36,10 @@
</span><span class="cx">
</span><span class="cx"> $translations_added = $translation_set->import( $translations );
</span><span class="cx"> $this->notices[] = sprintf(__("%s translations were added"), $translations_added );
</span><del>-
- $this->redirect( gp_url_project( $project, gp_url_join( $locale->slug, $translation_set->slug ) ) );
</del><ins>+
+ $this->redirect( gp_url_project( $project, gp_url_join( $locale->slug, $translation_set->slug ) ) );
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function export_translations_get( $project_path, $locale_slug, $translation_set_slug ) {
</span><span class="cx"> $project = GP::$project->by_path( $project_path );
</span><span class="cx"> $locale = GP_Locales::by_slug( $locale_slug );
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> $export_locale = apply_filters( 'export_locale', $locale->slug, $locale );
</span><span class="cx"> $filename = sprintf( '%s-%s.'.$format->extension, str_replace( '/', '-', $project->path ), $export_locale );
</span><span class="cx"> $entries = GP::$translation->for_export( $project, $translation_set, gp_get( 'filters' ) );
</span><del>- $this->headers_for_download( $filename );
</del><ins>+ $this->headers_for_download( $filename );
</ins><span class="cx"> echo $format->print_exported_file( $project, $locale, $translation_set, $entries );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> $translations = GP::$translation->for_translation( $project, $translation_set, $page, $filters, $sort );
</span><span class="cx"> $total_translations_count = GP::$translation->found_rows;
</span><del>-
</del><ins>+
</ins><span class="cx"> $can_edit = GP::$user->logged_in();
</span><span class="cx"> $can_write = $this->can( 'write', 'project', $project->id );
</span><span class="cx"> $can_approve = $this->can( 'approve', 'translation-set', $translation_set->id );
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> $locale = GP_Locales::by_slug( $locale_slug );
</span><span class="cx"> $translation_set = GP::$translation_set->by_project_id_slug_and_locale( $project->id, $translation_set_slug, $locale_slug );
</span><span class="cx"> if ( !$project || !$locale || !$translation_set ) gp_tmpl_404();
</span><del>-
</del><ins>+
</ins><span class="cx"> $output = array();
</span><span class="cx"> foreach( gp_post( 'translation', array() ) as $original_id => $translations) {
</span><span class="cx"> $data = compact('original_id');
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> }
</span><span class="cx"> echo json_encode( $output );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function bulk_post( $project_path, $locale_slug, $translation_set_slug ) {
</span><span class="cx">
</span><span class="cx"> $project = GP::$project->by_path( $project_path );
</span><span class="lines">@@ -152,18 +152,18 @@
</span><span class="cx"> } else {
</span><span class="cx"> $this->errors[] = 'No translations were supplied.';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> wp_cache_delete( $translation_set->id, 'translation_set_status_breakdown' );
</span><del>-
</del><ins>+
</ins><span class="cx"> // hack, until we make clean_url() to allow [ and ]
</span><span class="cx"> $bulk['redirect_to'] = str_replace( array('[', ']'), array_map('urlencode', array('[', ']')), $bulk['redirect_to']);
</span><span class="cx"> $this->redirect( $bulk['redirect_to'] );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function _bulk_approve( $project, $locale, $translation_set, $bulk ) {
</span><del>-
</del><ins>+
</ins><span class="cx"> $action = $bulk['action'];
</span><del>-
</del><ins>+
</ins><span class="cx"> $ok = $error = 0;
</span><span class="cx"> $new_status = 'approve' == $action? 'current' : 'rejected';
</span><span class="cx"> foreach( $bulk['row-ids'] as $row_id ) {
</span><span class="lines">@@ -205,13 +205,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function _bulk_google_translate( $project, $locale, $translation_set, $bulk ) {
</span><span class="cx"> $google_errors = 0;
</span><span class="cx"> $insert_errors = 0;
</span><span class="cx"> $ok = 0;
</span><span class="cx"> $skipped = 0;
</span><del>-
</del><ins>+
</ins><span class="cx"> $singulars = array();
</span><span class="cx"> $original_ids = array();
</span><span class="cx"> foreach( $bulk['row-ids'] as $row_id ) {
</span><span class="lines">@@ -261,27 +261,27 @@
</span><span class="cx"> $this->notices[] = sprintf( __('%d fuzzy translation from Google Translate were added.' ), $ok );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function discard_warning( $project_path, $locale_slug, $translation_set_slug ) {
</span><span class="cx"> return $this->edit_single_translation( $project_path, $locale_slug, $translation_set_slug, array( $this, 'discard_warning_edit_function' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function set_status( $project_path, $locale_slug, $translation_set_slug ) {
</span><span class="cx"> return $this->edit_single_translation( $project_path, $locale_slug, $translation_set_slug, array( $this, 'set_status_edit_function' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> private function edit_single_translation( $project_path, $locale_slug, $translation_set_slug, $edit_function ) {
</span><span class="cx"> $project = GP::$project->by_path( $project_path );
</span><span class="cx"> $locale = GP_Locales::by_slug( $locale_slug );
</span><span class="cx"> $translation_set = GP::$translation_set->by_project_id_slug_and_locale( $project->id, $translation_set_slug, $locale_slug );
</span><span class="cx"> if ( !$project || !$locale || !$translation_set ) gp_tmpl_404();
</span><span class="cx"> $this->can_or_forbidden( 'approve', 'translation-set', $translation_set->id );
</span><del>-
</del><ins>+
</ins><span class="cx"> $translation = GP::$translation->get( gp_post( 'translation_id' ) );
</span><span class="cx"> if ( !$translation ) {
</span><span class="cx"> $this->die_with_error( 'Translation doesn&#8217;t exist!' );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> call_user_func( $edit_function, $project, $locale, $translation_set, $translation );
</span><span class="cx">
</span><span class="cx"> $translations = GP::$translation->for_translation( $project, $translation_set, 'no-limit', array('translation_id' => $translation->id, 'status' => 'either'), array() );
</span><span class="lines">@@ -293,9 +293,9 @@
</span><span class="cx"> $this->tmpl( 'translation-row', get_defined_vars() );
</span><span class="cx"> } else {
</span><span class="cx"> $this->die_with_error( 'Error in retrieving translation!' );
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> private function discard_warning_edit_function( $project, $locale, $translation_set, $translation ) {
</span><span class="cx"> if ( !isset( $translation->warnings[gp_post( 'index' )][gp_post( 'key' )] ) ) {
</span><span class="cx"> $this->die_with_error( 'The warning doesn&#8217;exist!' );
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx"> if ( !$res ) {
</span><span class="cx"> $this->die_with_error( 'Error in saving the translation!' );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private function set_status_edit_function( $project, $locale, $translation_set, $translation ) {
</span><span class="lines">@@ -319,5 +319,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkgpincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/schema.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/schema.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/schema.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> KEY `user_id` (`user_id`),
</span><span class="cx"> KEY `meta_key` (`meta_key`)
</span><span class="cx"> );";
</span><del>-
</del><ins>+
</ins><span class="cx"> // meta
</span><span class="cx"> $gp_schema['meta'] = "CREATE TABLE IF NOT EXISTS `$gpdb->meta` (
</span><span class="cx"> `meta_id` bigint(20) NOT NULL auto_increment,
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> KEY `object_type__meta_key` (`object_type`, `meta_key`),
</span><span class="cx"> KEY `object_type__object_id__meta_key` (`object_type`, `object_id`, `meta_key`)
</span><span class="cx"> );";
</span><del>-
</del><ins>+
</ins><span class="cx"> // permissions
</span><span class="cx"> $gp_schema['permissions'] = "CREATE TABLE IF NOT EXISTS `$gpdb->permissions` (
</span><span class="cx"> `id` INT(10) NOT NULL AUTO_INCREMENT,
</span><span class="lines">@@ -166,12 +166,12 @@
</span><span class="cx"> if (!preg_match('@^\s*CREATE\s+TABLE\s+@im', $_sql)) {
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Skip if the table's database doesn't support collation
</span><span class="cx"> if (!$gpdb->has_cap('collation', $gpdb->$_table_name)) {
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Find out if the table has a custom database set
</span><span class="cx"> if (
</span><span class="cx"> isset($gpdb->db_tables) &&
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> // Set the default global database
</span><span class="cx"> $_database = 'dbh_global';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Make sure the database exists
</span><span class="cx"> if (
</span><span class="cx"> isset($gpdb->db_servers) &&
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> if ($_charset_collate) {
</span><span class="cx"> // Modify the SQL
</span><span class="cx"> $gp_schema[$_table_name] = str_replace(';', $_charset_collate . ';', $_sql);
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> unset($_database, $_charset_collate);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkgpincludesstringsphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/strings.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/strings.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/strings.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -62,5 +62,5 @@
</span><span class="cx"> $safe_text = wp_check_invalid_utf8( $text );
</span><span class="cx"> $safe_text = _wp_specialchars( $safe_text, ENT_QUOTES, false, true );
</span><span class="cx"> return apply_filters( 'attribute_escape', $safe_text, $text );
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkgpincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/template.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/template.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/template.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> if ( isset( $args['http_status'] ) )
</span><span class="cx"> status_header( $args['http_status'] );
</span><span class="cx"> foreach( $locations as $location ) {
</span><del>- $file = $location . "$template.php";
</del><ins>+ $file = $location . "$template.php";
</ins><span class="cx"> if ( is_readable( $file ) ) {
</span><span class="cx"> extract( $args, EXTR_SKIP );
</span><span class="cx"> include $file;
</span></span></pre></div>
<a id="trunkgpincludesthingspermissionphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/things/permission.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/things/permission.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/things/permission.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> var $field_names = array( 'id', 'user_id', 'action', 'object_type', 'object_id', );
</span><span class="cx"> var $non_updatable_attributes = array( 'id', );
</span><span class="cx">
</span><del>-
</del><ins>+
</ins><span class="cx"> function normalize_fields( $args ) {
</span><span class="cx"> $args = (array)$args;
</span><span class="cx"> foreach( $this->field_names as $field_name ) {
</span></span></pre></div>
<a id="trunkgpincludesthingsprojectphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/things/project.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/things/project.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/things/project.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> class GP_Project extends GP_Thing {
</span><del>-
</del><ins>+
</ins><span class="cx"> var $table_basename = 'projects';
</span><span class="cx"> var $field_names = array( 'id', 'name', 'slug', 'path', 'description', 'parent_project_id', 'source_url_template', 'active' );
</span><span class="cx"> var $non_updatable_attributes = array( 'id' );
</span><span class="lines">@@ -9,29 +9,29 @@
</span><span class="cx"> function restrict_fields( $project ) {
</span><span class="cx"> $project->name_should_not_be('empty');
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Additional queries
</span><span class="cx">
</span><span class="cx"> function by_path( $path ) {
</span><span class="cx"> return $this->one( "SELECT * FROM $this->table WHERE path = '%s'", trim( $path, '/' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function sub_projects() {
</span><span class="cx"> return $this->many( "SELECT * FROM $this->table WHERE parent_project_id = %d ORDER BY active DESC, id ASC", $this->id );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function top_level() {
</span><span class="cx"> return $this->many( "SELECT * FROM $this->table WHERE parent_project_id IS NULL ORDER BY name ASC" );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Triggers
</span><del>-
</del><ins>+
</ins><span class="cx"> function after_save() {
</span><del>- // TODO: pass the update args to after/pre_save?
</del><ins>+ // TODO: pass the update args to after/pre_save?
</ins><span class="cx"> // TODO: only call it if the slug or parent project were changed
</span><span class="cx"> return !is_null( $this->update_path() );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function after_create() {
</span><span class="cx"> // TODO: pass some args to pre/after_create?
</span><span class="cx"> if ( is_null( $this->update_path() ) ) return false;
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Helpers
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Updates this project's and its chidlren's paths, according to its current slug.
</span><span class="cx"> */
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> return $res_self;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Regenrate the paths of all projects from its parents slugs
</span><span class="cx"> */
</span><span class="lines">@@ -102,14 +102,14 @@
</span><span class="cx"> $this->regenerate_paths( $project->id );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function source_url( $file, $line ) {
</span><span class="cx"> if ( $this->source_url_template() ) {
</span><span class="cx"> return str_replace( array('%file%', '%line%'), array($file, $line), $this->source_url_template() );
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function source_url_template() {
</span><span class="cx"> if ( isset( $this->user_source_url_template ) )
</span><span class="cx"> return $this->user_source_url_template;
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Gives an array of project objects starting from the current project
</span><span class="cx"> * then its parent, its parent and up to the root
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> }
</span><span class="cx"> return array_merge( array( &$this ), $path );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function set_difference_from( $other_project ) {
</span><span class="cx"> $this_sets = (array)GP::$translation_set->by_project_id( $this->id );
</span><span class="cx"> $other_sets = (array)GP::$translation_set->by_project_id( $other_project->id );
</span><span class="lines">@@ -160,6 +160,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return compact( 'added', 'removed' );
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> GP::$project = new GP_Project();
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkgpincludesthingstranslationsetphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/things/translation-set.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/things/translation-set.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/things/translation-set.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -11,31 +11,31 @@
</span><span class="cx"> $set->locale_should_not_be('empty');
</span><span class="cx"> $set->project_id_should_not_be('empty');
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function name_with_locale( $separator = '&rarr;') {
</span><span class="cx"> $locale = GP_Locales::by_slug( $this->locale );
</span><span class="cx"> $parts = array( $locale->english_name );
</span><span class="cx"> if ( 'default' != $this->slug ) $parts[] = $this->name;
</span><span class="cx"> return implode( '&nbsp;'.$separator.'&nbsp;', $parts );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function by_project_id_slug_and_locale( $project_id, $slug, $locale_slug ) {
</span><span class="cx"> return $this->one( "
</span><span class="cx"> SELECT * FROM $this->table
</span><span class="cx"> WHERE slug = '%s' AND project_id= %d AND locale = %s", $slug, $project_id, $locale_slug );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function by_project_id( $project_id ) {
</span><span class="cx"> return $this->many( "
</span><span class="cx"> SELECT * FROM $this->table
</span><span class="cx"> WHERE project_id = %d ORDER BY name ASC", $project_id );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function import( $translations ) {
</span><span class="cx"> @ini_set('memory_limit', '256M');
</span><span class="cx"> if ( !isset( $this->project ) || !$this->project ) $this->project = GP::$project->get( $this->project_id );
</span><span class="cx"> $locale = GP_Locales::by_slug( $this->locale );
</span><del>-
</del><ins>+
</ins><span class="cx"> $current_translations_list = GP::$translation->for_translation( $this->project, $this, 'no-limit', array('status' => 'current', 'translated' => 'yes') );
</span><span class="cx"> $current_translations = new Translations();
</span><span class="cx"> foreach( $current_translations_list as $entry ) {
</span><span class="lines">@@ -46,9 +46,9 @@
</span><span class="cx"> foreach( $translations->entries as $entry ) {
</span><span class="cx"> if ( empty( $entry->translations ) ) continue;
</span><span class="cx"> if ( in_array( 'fuzzy', $entry->flags ) ) continue;
</span><del>-
</del><ins>+
</ins><span class="cx"> $create = false;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $translated = $current_translations->translate_entry( $entry ) ) {
</span><span class="cx"> // we have the same string translated
</span><span class="cx"> // create a new one if they don't match
</span><span class="lines">@@ -74,17 +74,17 @@
</span><span class="cx"> wp_cache_delete( $this->id, 'translation_set_status_breakdown' );
</span><span class="cx"> return $translations_added;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function waiting_count() {
</span><span class="cx"> if ( !isset( $this->waiting_count ) ) $this->update_status_breakdown();
</span><span class="cx"> return $this->waiting_count;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function untranslated_count() {
</span><span class="cx"> if ( !isset( $this->untranslated_count ) ) $this->update_status_breakdown();
</span><span class="cx"> return $this->untranslated_count;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function current_count() {
</span><span class="cx"> if ( !isset( $this->current_count ) ) $this->update_status_breakdown();
</span><span class="cx"> return $this->current_count;
</span></span></pre></div>
<a id="trunkgpincludesthingstranslationphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/things/translation.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/things/translation.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/things/translation.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> 'how' => 'desc'
</span><span class="cx"> );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $sort_by = gp_array_get( $sort_bys, gp_array_get( $sort, 'by' ), gp_array_get( $sort_bys, $default_sort['by'] ) );
</span><span class="cx"> $sort_hows = array('asc' => 'ASC', 'desc' => 'DESC', );
</span><span class="cx"> $sort_how = gp_array_get( $sort_hows, gp_array_get( $sort, 'how' ), gp_array_get( $sort_hows, $default_sort['how'] ) );
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> $join_where[] = 't.status != "rejected"';
</span><span class="cx"> $statuses = array_filter( $statuses, lambda( '$x', '$x != "untranslated"' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $statuses = array_filter( $statuses, lambda( '$s', 'in_array($s, $statuses)', array( 'statuses' => $this->get_static( 'statuses' ) ) ) );
</span><span class="cx"> if ( $statuses ) {
</span><span class="cx"> $statuses_where = array();
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> if ( $where ) {
</span><span class="cx"> $where = 'AND '.$where;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $join_where = implode( ' AND ', $join_where );
</span><span class="cx"> if ( $join_where ) {
</span><span class="cx"> $join_where = 'AND '.$join_where;
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> $sql_sort = sprintf( $sort_by, $sort_how );
</span><span class="cx">
</span><span class="cx"> $limit = $this->sql_limit_for_paging( $page, $this->per_page );
</span><del>-
</del><ins>+
</ins><span class="cx"> $sql_for_translations = "
</span><span class="cx"> SELECT SQL_CALC_FOUND_ROWS t.*, o.*, t.id as id, o.id as original_id, t.status as translation_status, o.status as original_status, t.date_added as translation_added, o.date_added as original_added
</span><span class="cx"> FROM $gpdb->originals as o
</span></span></pre></div>
<a id="trunkgpincludesthingsuserphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/things/user.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/things/user.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/things/user.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -1,10 +1,10 @@
</span><span class="cx"> <?php
</span><span class="cx"> class GP_User extends GP_Thing {
</span><del>-
</del><ins>+
</ins><span class="cx"> var $table_basename = 'users';
</span><span class="cx"> var $field_names = array( 'id', 'user_login', 'user_pass', 'user_nicename', 'user_email', 'user_url', 'user_registered', 'user_status', 'display_name' );
</span><span class="cx"> var $non_updatable_attributes = array( 'ID' );
</span><del>-
</del><ins>+
</ins><span class="cx"> function create( $args ) {
</span><span class="cx"> global $wp_users_object;
</span><span class="cx"> if ( isset( $args['id'] ) ) {
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> $user = $wp_users_object->new_user( $args );
</span><span class="cx"> return $this->coerce( $user );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function normalize_fields( $args ) {
</span><span class="cx"> $args = (array)$args;
</span><span class="cx"> if ( isset( $args['ID'] ) ) {
</span><span class="lines">@@ -23,25 +23,25 @@
</span><span class="cx"> }
</span><span class="cx"> return $args;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function get( $user_or_id ) {
</span><span class="cx"> global $wp_users_object;
</span><span class="cx"> if ( is_object( $user_or_id ) ) $user_or_id = $user_or_id->id;
</span><span class="cx"> return $this->coerce( $wp_users_object->get_user( $user_or_id ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function by_login( $login ) {
</span><span class="cx"> global $wp_users_object;
</span><span class="cx"> $user = $wp_users_object->get_user( $login, array( 'by' => 'login' ) );
</span><span class="cx"> return $this->coerce( $user );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function logged_in() {
</span><span class="cx"> global $wp_auth_object;
</span><span class="cx"> $coerced = $this->coerce( $wp_auth_object->get_current_user() );
</span><span class="cx"> return ( $coerced && $coerced->id );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function current() {
</span><span class="cx"> global $wp_auth_object;
</span><span class="cx"> if ( $this->logged_in() )
</span><span class="lines">@@ -49,19 +49,19 @@
</span><span class="cx"> else
</span><span class="cx"> return new GP_User( array( 'id' => 0, ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function logout() {
</span><span class="cx"> global $wp_auth_object;
</span><span class="cx"> $wp_auth_object->clear_auth_cookie();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Determines whether the user is an admin
</span><span class="cx"> */
</span><span class="cx"> function admin() {
</span><span class="cx"> return $this->can( 'admin' );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Set $this as the current user if $password patches this user's password
</span><span class="cx"> */
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> $this->set_as_current();
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Makes the user the current user of this session. Sets the cookies and such.
</span><span class="cx"> */
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> $wp_auth_object->set_auth_cookie( $this->id );
</span><span class="cx"> $wp_auth_object->set_auth_cookie( $this->id, 0, 0, 'logged_in');
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Determines whether the user can do $action on the instance of $object_type with id $object_id.
</span><span class="cx"> *
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> GP::$permission->find_one( array_merge( $args, array( 'object_id' => null ) ) );
</span><span class="cx"> return apply_filters( 'can_user', $verdict, $filter_args );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function get_meta( $key ) {
</span><span class="cx"> global $wp_users_object;
</span><span class="cx"> if ( !$user = $wp_users_object->get_user( $this->id ) ) {
</span><span class="lines">@@ -122,16 +122,16 @@
</span><span class="cx"> }
</span><span class="cx"> return $user->$key;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function set_meta( $key, $value ) {
</span><span class="cx"> return gp_update_meta( $this->id, $key, $value, 'user' );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function delete_meta( $key ) {
</span><span class="cx"> return gp_delete_meta( $this->id, $key, '', 'user' );
</span><span class="cx"> }
</span><del>-
-
</del><ins>+
+
</ins><span class="cx"> function reintialize_wp_users_object() {
</span><span class="cx"> global $gpdb, $wp_auth_object, $wp_users_object;
</span><span class="cx"> $wp_users_object = new WP_Users( $gpdb );
</span></span></pre></div>
<a id="trunkgpincludesthingsvalidatorpermissionphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/things/validator-permission.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/things/validator-permission.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/things/validator-permission.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> $permission->action_should_not_be('empty');
</span><span class="cx"> $permission->set_slug_should_not_be('empty');
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function set_fields( $db_object ) {
</span><span class="cx"> parent::set_fields( $db_object );
</span><span class="cx"> if ( $this->object_id ) {
</span><span class="lines">@@ -33,15 +33,15 @@
</span><span class="cx"> $args = parent::prepare_fields_for_save( $args );
</span><span class="cx"> return $args;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function project_id_locale_slug_set_slug( $object_id ) {
</span><span class="cx"> return explode( '|', $object_id );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function object_id( $project_id, $locale_slug, $set_slug = 'default' ) {
</span><span class="cx"> return implode( '|', array( $project_id, $locale_slug, $set_slug ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function by_project_id( $project_id ) {
</span><span class="cx"> $project_id = (int)$project_id;
</span><span class="cx"> return $this->find_many( "object_id LIKE '$project_id|%'" );
</span></span></pre></div>
<a id="trunkgpincludesvalidationphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/validation.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/validation.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-includes/validation.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -1,21 +1,21 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> class GP_Validation_Rules {
</span><del>-
</del><ins>+
</ins><span class="cx"> var $rules = array();
</span><span class="cx"> var $errors = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> static $positive_suffices = array(
</span><span class="cx"> 'should_be', 'should', 'can', 'can_be',
</span><span class="cx"> );
</span><span class="cx"> static $negative_suffices = array(
</span><span class="cx"> 'should_not_be', 'should_not', 'cant', 'cant_be',
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> function __construct( $field_names ) {
</span><span class="cx"> $this->field_names = $field_names;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function __call( $name, $args ) {
</span><span class="cx"> foreach( array( 'positive', 'negative' ) as $kind ) {
</span><span class="cx"> $suffices = "{$kind}_suffices";
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> }
</span><span class="cx"> trigger_error(sprintf('Call to undefined function: %s::%s().', get_class($this), $name), E_USER_ERROR);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function run( $thing ) {
</span><span class="cx"> $this->errors = array();
</span><span class="cx"> $verdict = true;
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> }
</span><span class="cx"> return $verdict;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function run_on_single_field( $field, $value ) {
</span><span class="cx"> if ( !isset( $this->rules[$field] ) || !is_array( $this->rules[$field] ) ) {
</span><span class="cx"> // no rules means always valid
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> }
</span><span class="cx"> return $verdict;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function construct_error_message( $rule, $value ) {
</span><span class="cx"> // TODO: better error messages, should include info from callback
</span><span class="cx"> return sprintf( __('The field <strong>%s</strong> has invalid value!'), $rule['field'], $value );
</span><span class="lines">@@ -86,16 +86,16 @@
</span><span class="cx">
</span><span class="cx"> class GP_Validators {
</span><span class="cx"> static $callbacks = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> static function register( $key, $callback, $negative_callback = null ) {
</span><del>- // TODO: add data for easier generation of error messages
</del><ins>+ // TODO: add data for easier generation of error messages
</ins><span class="cx"> self::$callbacks[$key] = array( 'positive' => $callback, 'negative' => $negative_callback );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> static function unregister( $key ) {
</span><span class="cx"> unset( self::$callbacks[$key] );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> static function get( $key ) {
</span><span class="cx"> return gp_array_get( self::$callbacks, $key, null );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkgploadphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-load.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-load.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-load.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -24,15 +24,15 @@
</span><span class="cx"> require_once GP_CONFIG_FILE;
</span><span class="cx"> require_once( GP_PATH . 'gp-settings.php' );
</span><span class="cx"> } elseif ( file_exists( GP_PATH . 'gp-config.php') ) {
</span><del>-
</del><ins>+
</ins><span class="cx"> require_once( GP_PATH . 'gp-config.php');
</span><span class="cx"> require_once( GP_PATH . 'gp-settings.php' );
</span><del>-
</del><ins>+
</ins><span class="cx"> } elseif ( file_exists( dirname( GP_PATH ) . '/gp-config.php') ) {
</span><del>-
</del><ins>+
</ins><span class="cx"> require_once( dirname( GP_PATH ) . '/gp-config.php' );
</span><span class="cx"> require_once( GP_PATH . 'gp-settings.php' );
</span><del>-
</del><ins>+
</ins><span class="cx"> } elseif ( !defined( 'GP_INSTALLING' ) || !GP_INSTALLING ) {
</span><span class="cx">
</span><span class="cx"> $install_uri = preg_replace( '|/[^/]+?$|', '/', $_SERVER['PHP_SELF'] ) . 'install.php';
</span></span></pre></div>
<a id="trunkgptemplatesheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/header.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/header.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-templates/header.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> if (GP::$user->logged_in()):
</span><span class="cx"> $user = GP::$user->current();
</span><del>-
</del><ins>+
</ins><span class="cx"> printf( __('Hi, %s.'), '<a href="'.gp_url( '/profile' ).'">'.$user->user_login.'</a>' );
</span><span class="cx"> ?>
</span><span class="cx"> <a href="<?php echo gp_url('/logout')?>"><?php _e('Log out'); ?></a>
</span></span></pre></div>
<a id="trunkgptemplateshelperfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/helper-functions.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/helper-functions.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-templates/helper-functions.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <div class="warning secondary">
</span><span class="cx"> <?php printf( __('<strong>Warning:</strong> %s'), esc_html( $warning['value'] ) ); ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php if( $can_approve ): ?>
</span><span class="cx"> <a href="#" class="discard-warning" key="<?php echo $warning['key'] ?>" index="<?php echo $index; ?>"><?php _e('Discard'); ?></a>
</span><span class="cx"> <?php endif; ?>
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> if ( !$project->source_url_template() ) return;
</span><span class="cx"> ?>
</span><span class="cx"> <?php _e('References:'); ?>
</span><del>- <ul class="refs">
</del><ins>+ <ul class="refs">
</ins><span class="cx"> <?php
</span><span class="cx"> foreach( $entry->references as $reference ):
</span><span class="cx"> list( $file, $line ) = array_pad( explode( ':', $reference ), 2, 0 );
</span></span></pre></div>
<a id="trunkgptemplatesinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/install.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/install.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-templates/install.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -37,5 +37,5 @@
</span><span class="cx"> <?php _e('<strong>The default username is <code>admin</code>, whose password is simply <code>a</code>.</strong>'); ?>
</span><span class="cx"> </p>
</span><span class="cx"> <?php endif; ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php gp_tmpl_footer(); ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkgptemplatesloginphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/login.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/login.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-templates/login.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> <dl>
</span><span class="cx"> <dt><label for="user_login"><?php _e('Username'); ?></label></dt>
</span><span class="cx"> <dd><input type="text" value="" id="user_login" name="user_login" /></dd>
</span><del>-
</del><ins>+
</ins><span class="cx"> <dt><label for="user_pass"><?php _e('Password'); ?></label></dt>
</span><span class="cx"> <dd><input type="password" value="" id="user_pass" name="user_pass" /></dd>
</span><span class="cx"> </dl>
</span></span></pre></div>
<a id="trunkgptemplatesprojectformphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/project-form.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/project-form.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-templates/project-form.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -1,13 +1,13 @@
</span><span class="cx"> <dl>
</span><span class="cx"> <dt><label for="project[name]"><?php _e('Name'); ?></label></dt>
</span><span class="cx"> <dd><input type="text" name="project[name]" value="<?php echo esc_html( $project->name ); ?>" id="project[name]"></dd>
</span><del>-
</del><ins>+
</ins><span class="cx"> <!-- TODO: make slug edit WordPress style -->
</span><span class="cx"> <dt><label for="project[slug]"><?php _e('Slug'); ?></label></dt>
</span><span class="cx"> <dd>
</span><span class="cx"> <input type="text" name="project[slug]" value="<?php echo esc_html( $project->slug ); ?>" id="project[slug]">
</span><span class="cx"> <small><?php _e('If you leave the slug empty, it will be derived from the name.'); ?></small>
</span><del>- </dd>
</del><ins>+ </dd>
</ins><span class="cx">
</span><span class="cx"> <dt><label for="project[description]"><?php _e('Description'); ?></label> <span class="ternary">can include HTML</span></dt>
</span><span class="cx"> <dd><textarea name="project[description]" rows="4" cols="40" id="project[description]"><?php echo esc_html( $project->description ); ?></textarea></dd>
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx">
</span><span class="cx"> <dt><label for="project[parent_project_id]"><?php _e('Parent Project'); ?></label></dt>
</span><span class="cx"> <dd><?php echo gp_projects_dropdown( 'project[parent_project_id]', $project->parent_project_id); ?></dd>
</span><del>-
</del><ins>+
</ins><span class="cx"> <dt><label for="project[active]"><?php _e('Active'); ?></label> <input type="checkbox" id="project[active]" name="project[active]" <?php gp_checked( $project->active ); ?> /></dt>
</span><span class="cx"> </dl>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkgptemplatesprojectpermissionsphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/project-permissions.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/project-permissions.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-templates/project-permissions.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -26,11 +26,11 @@
</span><span class="cx"> <a href="<?php echo gp_url_join( gp_url_current(), '-delete/'.$permission->id ); ?>" class="action delete"><?php _e('Remove'); ?></a>
</span><span class="cx"> </li>
</span><span class="cx"> <?php endforeach; ?>
</span><del>-</ul>
</del><ins>+</ul>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php if ( $parent_permissions ): ?>
</span><span class="cx"> <h4 id="validators"><?php _e('Validators for parent projects'); ?></h4>
</span><del>-<ul class="permissions">
</del><ins>+<ul class="permissions">
</ins><span class="cx"> <?php foreach( $parent_permissions as $permission ): ?>
</span><span class="cx"> <li>
</span><span class="cx"> <span class="permission-action"><?php _e('user'); ?></span>
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> <span class="user"><?php gp_link_project( $permission->project, esc_html( $permission->project->name ) ); ?></span>
</span><span class="cx"> </li>
</span><span class="cx"> <?php endforeach; ?>
</span><del>-</ul>
</del><ins>+</ul>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php if ( !$permissions && !$parent_permissions ): ?>
</span><span class="cx"> <strong><?php _e('No validators defined for this project.'); ?></strong>
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> <dd><?php echo gp_locales_dropdown( 'locale' ); ?></dd>
</span><span class="cx"> <dt><label for="set-slug"><?php _e('Translation set slug:'); ?></label></dt>
</span><span class="cx"> <dd><input type="text" name="set-slug" value="default" id="set-slug" /></dd>
</span><del>-
</del><ins>+
</ins><span class="cx"> <dt>
</span><span class="cx"> <input type="submit" name="submit" value="<?php echo esc_attr(__('Add')); ?>" id="submit" />
</span><span class="cx"> <input type="hidden" name="action" value="add-validator" />
</span></span></pre></div>
<a id="trunkgptemplatesprojectphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/project.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/project.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-templates/project.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> <p>
</span><span class="cx"> <input type="submit" name="submit" value="<?php echo esc_attr(__('Save &rarr;')); ?>" id="save" />
</span><span class="cx"> <a class="ternary" href="#" onclick="jQuery('#personal-options-toggle').click();return false;"><?php _e('Cancel'); ?></a>
</span><del>- </p>
</del><ins>+ </p>
</ins><span class="cx"> </form>
</span><span class="cx"> </div>
</span><span class="cx"> </li>
</span></span></pre></div>
<a id="trunkgptemplatestranslationrowphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/translation-row.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/translation-row.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-templates/translation-row.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> <?php if ( $t->context ): ?>
</span><span class="cx"> <span class="context bubble" title="<?php printf( __('Context: %s'), esc_html($t->context) ); ?>"><?php echo esc_html($t->context); ?></span>
</span><span class="cx"> <?php endif; ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> </td>
</span><span class="cx"> <td class="translation foreign-text">
</span><span class="cx"> <?php
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </div>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="meta">
</span><span class="cx"> <h3><?php _e('Meta'); ?></h3>
</span><span class="cx"> <dl>
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> <dd>
</span><span class="cx"> <?php echo display_status( $t->translation_status ); ?>
</span><span class="cx"> <?php if ( $can_approve && $t->translation_status ): ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php if ( $t->translation_status != 'current' ): ?>
</span><span class="cx"> <button class="approve" tabindex="-1"><strong>+</strong> Approve</button>
</span><span class="cx"> <?php endif; ?>
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> <dd><?php echo esc_html($t->priority); ?></dd>
</span><span class="cx"> </dl>
</span><span class="cx"> -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php if ( $t->context ): ?>
</span><span class="cx"> <dl>
</span><span class="cx"> <dt><?php _e('Context:'); ?></dt>
</span><span class="lines">@@ -131,9 +131,9 @@
</span><span class="cx"> <dd><?php echo $t->user_login; ?></dd>
</span><span class="cx"> </dl>
</span><span class="cx"> <?php endif; ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php references( $project, $t ); ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <dl>
</span><span class="cx"> <dt><?php _e('Priority of the original:'); ?></dt>
</span><span class="cx"> <?php if ( $can_write ): ?>
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> <dd><?php echo gp_array_get( GP::$original->get_static( 'priorities' ), $t->priority, 'unknown' ); ?></dd>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </dl>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php $extra_args = $t->translation_status? array( 'filters[translation_id]' => $t->id ) : array(); ?>
</span><span class="cx"> <dl>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkgptemplatestranslationsetformphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/translation-set-form.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/translation-set-form.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-templates/translation-set-form.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -4,10 +4,10 @@
</span><span class="cx"> <?php echo gp_locales_dropdown( 'set[locale]', $set->locale ); ?>
</span><span class="cx"> <a href="#" id="copy"><?php _e('Use as name'); ?></a>
</span><span class="cx"> </dd>
</span><del>-
</del><ins>+
</ins><span class="cx"> <dt><label for="set[name]"><?php _e('Name'); ?></label></dt>
</span><span class="cx"> <dd><input type="text" name="set[name]" value="<?php echo esc_html( $set->name ); ?>" id="set[name]"></dd>
</span><del>-
</del><ins>+
</ins><span class="cx"> <!-- TODO: make slug edit WordPress style -->
</span><span class="cx"> <dt><label for="set[slug]"><?php _e('Slug'); ?></label></dt>
</span><span class="cx"> <dd><input type="text" name="set[slug]" value="<?php echo esc_html( $set->slug? $set->slug : 'default' ); ?>" id="set[slug]"></dd>
</span></span></pre></div>
<a id="trunkgptemplatestranslationsphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-templates/translations.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-templates/translations.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/gp-templates/translations.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> __('Fuzzy') );
</span><span class="cx"> $filter_links[] = gp_link_get( add_query_arg( array('filters[warnings]' => 'yes', 'filters[status]' => 'current_or_waiting', 'sort[by]' => 'translation_date_added'), $url ),
</span><span class="cx"> __('Warnings') );
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> // TODO: with warnings
</span><span class="cx"> // TODO: saved searches
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> 'old' => __('Approved, but obsoleted by another string'),
</span><span class="cx"> 'waiting' => __('Waiting approval'),
</span><span class="cx"> 'rejected' => __('Rejected'),
</span><del>- 'untranslated' => __('Without current translation'),
</del><ins>+ 'untranslated' => __('Without current translation'),
</ins><span class="cx"> 'either' => __('Any'),
</span><span class="cx"> ), gp_array_get( $filters, 'status', 'current_or_waiting_or_fuzzy_or_untranslated' ) );
</span><span class="cx"> ?>
</span><span class="lines">@@ -87,8 +87,8 @@
</span><span class="cx"> <input type="checkbox" name="filters[with_comment]" value="yes" id="filters[with_comment][yes]" <?php gp_checked( 'yes' == gp_array_get( $filters, 'with_comment' ) ); ?>><label for='filters[with_comment][yes]'><?php _e( 'With comment' ); ?></label><br />
</span><span class="cx"> <input type="checkbox" name="filters[with_context]" value="yes" id="filters[with_context][yes]" <?php gp_checked( 'yes' == gp_array_get( $filters, 'with_context' ) ); ?>><label for='filters[with_context][yes]'><?php _e( 'With context' ); ?></label>
</span><span class="cx"> </dd>
</span><del>-
-
</del><ins>+
+
</ins><span class="cx"> <dd><input type="submit" value="<?php echo esc_attr(__('Filter')); ?>" name="filter" /></dd>
</span><span class="cx"> </dl>
</span><span class="cx"> <dl class="filters-expanded sort hidden clearfix">
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> 'how' => 'desc'
</span><span class="cx"> );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> echo gp_radio_buttons('sort[by]',
</span><span class="cx"> array(
</span><span class="cx"> 'original_date_added' => __('Date added (original)'),
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> $format_dropdown = gp_select( 'export-format', array_combine( $format_slugs, $format_slugs ), 'po' );
</span><span class="cx"> /* translators: 1: export 2: what to export dropdown (all/filtered) 3: export format */
</span><span class="cx"> $footer_links[] = sprintf( __('%1$s %2$s as %3$s'), $export_link, $what_dropdown, $format_dropdown );
</span><del>-
</del><ins>+
</ins><span class="cx"> echo implode( ' &bull; ', apply_filters( 'translations_footer_links', $footer_links, $project, $locale, $translation_set ) );
</span><span class="cx"> ?>
</span><span class="cx"> </p>
</span></span></pre></div>
<a id="trunklocaleslocalesphp"></a>
<div class="modfile"><h4>Modified: trunk/locales/locales.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/locales/locales.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/locales/locales.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -1551,7 +1551,7 @@
</span><span class="cx"> $tg->google_code = 'tg';
</span><span class="cx"> $tg->nplurals = 2;
</span><span class="cx"> $tg->plural_expression = 'n != 1;';
</span><del>-
</del><ins>+
</ins><span class="cx"> $th = new GP_Locale();
</span><span class="cx"> $th->english_name = 'Thai';
</span><span class="cx"> $th->native_name = 'ไทย';
</span><span class="lines">@@ -1702,7 +1702,7 @@
</span><span class="cx"> $yi->slug = 'yi';
</span><span class="cx"> $yi->google_code = 'yi';
</span><span class="cx"> $yi->rtl = true;
</span><del>-
</del><ins>+
</ins><span class="cx"> $yo = new GP_Locale();
</span><span class="cx"> $yo->english_name = 'Yorùbá';
</span><span class="cx"> $yo->native_name = 'èdè Yorùbá';
</span></span></pre></div>
<a id="trunkpomoentryphp"></a>
<div class="modfile"><h4>Modified: trunk/pomo/entry.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/pomo/entry.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/pomo/entry.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -65,14 +65,14 @@
</span><span class="cx"> // prepend context and EOT, like in MO files
</span><span class="cx"> return is_null($this->context)? $this->singular : $this->context.chr(4).$this->singular;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function merge_with(&$other) {
</span><span class="cx"> $this->flags = array_unique( array_merge( $this->flags, $other->flags ) );
</span><span class="cx"> $this->references = array_unique( array_merge( $this->references, $other->references ) );
</span><span class="cx"> if ( $this->extracted_comments != $other->extracted_comments ) {
</span><span class="cx"> $this->extracted_comments .= $other->extracted_comments;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkpomomophp"></a>
<div class="modfile"><h4>Modified: trunk/pomo/mo.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/pomo/mo.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/pomo/mo.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> fclose($fh);
</span><span class="cx"> return $res;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function export() {
</span><span class="cx"> $tmp_fh = fopen("php://temp", 'r+');
</span><span class="cx"> if ( !$tmp_fh ) return false;
</span><span class="lines">@@ -42,19 +42,19 @@
</span><span class="cx"> rewind( $tmp_fh );
</span><span class="cx"> return stream_get_contents( $tmp_fh );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function is_entry_good_for_export( $entry ) {
</span><span class="cx"> if ( empty( $entry->translations ) ) {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !array_filter( $entry->translations ) ) {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function export_to_file_handle($fh) {
</span><span class="cx"> $entries = array_filter( $this->entries, array( $this, 'is_entry_good_for_export' ) );
</span><span class="cx"> ksort($entries);
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> fwrite($fh, pack('V*', $magic, $revision, $total, $originals_lenghts_addr,
</span><span class="cx"> $translations_lenghts_addr, $size_of_hash, $hash_addr));
</span><span class="cx"> fseek($fh, $originals_lenghts_addr);
</span><del>-
</del><ins>+
</ins><span class="cx"> // headers' msgid is an empty string
</span><span class="cx"> fwrite($fh, pack('VV', 0, $current_addr));
</span><span class="cx"> $current_addr++;
</span><span class="lines">@@ -81,24 +81,24 @@
</span><span class="cx"> fwrite($fh, pack('VV', $length, $current_addr));
</span><span class="cx"> $current_addr += $length + 1; // account for the NULL byte after
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $exported_headers = $this->export_headers();
</span><span class="cx"> fwrite($fh, pack('VV', strlen($exported_headers), $current_addr));
</span><span class="cx"> $current_addr += strlen($exported_headers) + 1;
</span><span class="cx"> $translations_table = $exported_headers . chr(0);
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach($entries as $entry) {
</span><span class="cx"> $translations_table .= $this->export_translations($entry) . chr(0);
</span><span class="cx"> $length = strlen($this->export_translations($entry));
</span><span class="cx"> fwrite($fh, pack('VV', $length, $current_addr));
</span><span class="cx"> $current_addr += $length + 1;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> fwrite($fh, $originals_table);
</span><span class="cx"> fwrite($fh, $translations_table);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function export_original($entry) {
</span><span class="cx"> //TODO: warnings for control characters
</span><span class="cx"> $exported = $entry->singular;
</span><span class="lines">@@ -106,12 +106,12 @@
</span><span class="cx"> if (!is_null($entry->context)) $exported = $entry->context . chr(4) . $exported;
</span><span class="cx"> return $exported;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function export_translations($entry) {
</span><span class="cx"> //TODO: warnings for control characters
</span><span class="cx"> return implode(chr(0), $entry->translations);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function export_headers() {
</span><span class="cx"> $exported = '';
</span><span class="cx"> foreach($this->headers as $header => $value) {
</span></span></pre></div>
<a id="trunkpomopophp"></a>
<div class="modfile"><h4>Modified: trunk/pomo/po.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/pomo/po.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/pomo/po.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> */
</span><span class="cx"> if ( !class_exists( 'PO' ) ):
</span><span class="cx"> class PO extends Gettext_Translations {
</span><del>-
</del><ins>+
</ins><span class="cx"> var $comments_before_headers = '';
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> if (false === $res) return false;
</span><span class="cx"> return fclose($fh);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Text to include as a comment before the start of the PO contents
</span><span class="cx"> *
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> $po = str_replace("$newline$quote$quote", '', $po);
</span><span class="cx"> return $po;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Gives back the original string from a PO-formatted string
</span><span class="cx"> *
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> }
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function read_entry($f, $lineno = 0) {
</span><span class="cx"> $entry = new Translation_Entry();
</span><span class="cx"> // where were we in the last step
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx"> }
</span><span class="cx"> return array('entry' => $entry, 'lineno' => $lineno);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function read_line($f, $action = 'read') {
</span><span class="cx"> static $last_line = '';
</span><span class="cx"> static $use_last_line = false;
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx"> $use_last_line = false;
</span><span class="cx"> return $line;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function add_comment_to_entry(&$entry, $po_comment_line) {
</span><span class="cx"> $first_two = substr($po_comment_line, 0, 2);
</span><span class="cx"> $comment = trim(substr($po_comment_line, 2));
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx"> $entry->translator_comments = trim($entry->translator_comments . "\n" . $comment);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function trim_quotes($s) {
</span><span class="cx"> if ( substr($s, 0, 1) == '"') $s = substr($s, 1);
</span><span class="cx"> if ( substr($s, -1, 1) == '"') $s = substr($s, 0, -1);
</span></span></pre></div>
<a id="trunkpomostreamsphp"></a>
<div class="modfile"><h4>Modified: trunk/pomo/streams.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/pomo/streams.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/pomo/streams.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -10,15 +10,15 @@
</span><span class="cx">
</span><span class="cx"> if ( !class_exists( 'POMO_Reader' ) ):
</span><span class="cx"> class POMO_Reader {
</span><del>-
</del><ins>+
</ins><span class="cx"> var $endian = 'little';
</span><span class="cx"> var $_post = '';
</span><del>-
</del><ins>+
</ins><span class="cx"> function POMO_Reader() {
</span><span class="cx"> $this->is_overloaded = ((ini_get("mbstring.func_overload") & 2) != 0) && function_exists('mb_substr');
</span><span class="cx"> $this->_pos = 0;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Sets the endianness of the file.
</span><span class="cx"> *
</span><span class="lines">@@ -57,8 +57,8 @@
</span><span class="cx"> $endian_letter = ('big' == $this->endian)? 'N' : 'V';
</span><span class="cx"> return unpack($endian_letter.$count, $bytes);
</span><span class="cx"> }
</span><del>-
-
</del><ins>+
+
</ins><span class="cx"> function substr($string, $start, $length) {
</span><span class="cx"> if ($this->is_overloaded) {
</span><span class="cx"> return mb_substr($string, $start, $length, 'ascii');
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> return substr($string, $start, $length);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function strlen($string) {
</span><span class="cx"> if ($this->is_overloaded) {
</span><span class="cx"> return mb_strlen($string, 'ascii');
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> return strlen($string);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function str_split($string, $chunk_size) {
</span><span class="cx"> if (!function_exists('str_split')) {
</span><span class="cx"> $length = $this->strlen($string);
</span><span class="lines">@@ -86,8 +86,8 @@
</span><span class="cx"> return str_split( $string, $chunk_size );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
-
</del><ins>+
+
</ins><span class="cx"> function pos() {
</span><span class="cx"> return $this->_pos;
</span><span class="cx"> }
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> function is_resource() {
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function close() {
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -108,11 +108,11 @@
</span><span class="cx"> parent::POMO_Reader();
</span><span class="cx"> $this->_f = fopen($filename, 'rb');
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function read($bytes) {
</span><span class="cx"> return fread($this->_f, $bytes);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function seekto($pos) {
</span><span class="cx"> if ( -1 == fseek($this->_f, $pos, SEEK_SET)) {
</span><span class="cx"> return false;
</span><span class="lines">@@ -120,19 +120,19 @@
</span><span class="cx"> $this->_pos = $pos;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function is_resource() {
</span><span class="cx"> return is_resource($this->_f);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function feof() {
</span><span class="cx"> return feof($this->_f);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function close() {
</span><span class="cx"> return fclose($this->_f);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function read_all() {
</span><span class="cx"> $all = '';
</span><span class="cx"> while ( !$this->feof() )
</span><span class="lines">@@ -148,9 +148,9 @@
</span><span class="cx"> * of a physical file.
</span><span class="cx"> */
</span><span class="cx"> class POMO_StringReader extends POMO_Reader {
</span><del>-
</del><ins>+
</ins><span class="cx"> var $_str = '';
</span><del>-
</del><ins>+
</ins><span class="cx"> function POMO_StringReader($str = '') {
</span><span class="cx"> parent::POMO_Reader();
</span><span class="cx"> $this->_str = $str;
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> function read_all() {
</span><span class="cx"> return $this->substr($this->_str, $this->_pos, $this->strlen($this->_str));
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkpomotranslationsphp"></a>
<div class="modfile"><h4>Modified: trunk/pomo/translations.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/pomo/translations.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/pomo/translations.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> $this->entries[$key] = &$entry;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function add_entry_or_merge($entry) {
</span><span class="cx"> if (is_array($entry)) {
</span><span class="cx"> $entry = new Translation_Entry($entry);
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> $this->entries[$entry->key()] = $entry;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function merge_originals_with(&$other) {
</span><span class="cx"> foreach( $other->entries as $entry ) {
</span><span class="cx"> if ( !isset( $this->entries[$entry->key()] ) )
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> }
</span><span class="cx"> return call_user_func($this->_gettext_select_plural_form, $count);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function nplurals_and_expression_from_header($header) {
</span><span class="cx"> if (preg_match('/^\s*nplurals\s*=\s*(\d+)\s*;\s+plural\s*=\s*(.+)$/', $header, $matches)) {
</span><span class="cx"> $nplurals = (int)$matches[1];
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> }
</span><span class="cx"> return rtrim($res, ';');
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function make_headers($translation) {
</span><span class="cx"> $headers = array();
</span><span class="cx"> // sometimes \ns are used instead of real new lines
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> }
</span><span class="cx"> return $headers;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function set_header($header, $value) {
</span><span class="cx"> parent::set_header($header, $value);
</span><span class="cx"> if ('Plural-Forms' == $header) {
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> class NOOP_Translations {
</span><span class="cx"> var $entries = array();
</span><span class="cx"> var $headers = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> function add_entry($entry) {
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkscriptsaddadminphp"></a>
<div class="modfile"><h4>Modified: trunk/scripts/add-admin.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/scripts/add-admin.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/scripts/add-admin.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> class GP_Script_Add_Admin extends GP_CLI {
</span><span class="cx">
</span><span class="cx"> var $usage = "<username-to-make-an-admin>";
</span><del>-
</del><ins>+
</ins><span class="cx"> function run() {
</span><span class="cx"> if ( empty( $this->args ) ) {
</span><span class="cx"> $this->usage();
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> exit( 2 );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkscriptsexportphp"></a>
<div class="modfile"><h4>Modified: trunk/scripts/export.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/scripts/export.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/scripts/export.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> require_once dirname( dirname( __FILE__ ) ) . '/gp-load.php';
</span><span class="cx">
</span><span class="cx"> class GP_Script_Export extends GP_Translation_Set_Script {
</span><del>-
</del><ins>+
</ins><span class="cx"> var $filter_options = array(
</span><span class="cx"> 'f' => array( 'key' => 'term', 'desc' => 'search term' ),
</span><span class="cx"> 'q' => array( 'key' => 'status', 'desc' => 'translation string status' ),
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> $this->add_filters_to_options_and_usage();
</span><span class="cx"> parent::__construct();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function action_on_translation_set( $translation_set ) {
</span><span class="cx">
</span><span class="cx"> $format = gp_array_get( GP::$formats, isset( $this->options['o'] )? $this->options['o'] : 'po', null );
</span><span class="lines">@@ -23,12 +23,12 @@
</span><span class="cx"> $entries = GP::$translation->for_export( $this->project, $translation_set, $this->get_filters_for_translation() );
</span><span class="cx"> echo $format->print_exported_file( $this->project, $this->locale, $translation_set, $entries )."\n";
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function add_filters_to_options_and_usage() {
</span><span class="cx"> foreach( $this->filter_options as $option => $details ) {
</span><span class="cx"> $this->short_options .= "$option:";
</span><span class="cx"> $this->usage .= " [-$option <{$details['desc']}>]";
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function get_filters_for_translation() {
</span></span></pre></div>
<a id="trunkscriptsimportoriginalsphp"></a>
<div class="modfile"><h4>Modified: trunk/scripts/import-originals.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/scripts/import-originals.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/scripts/import-originals.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -2,11 +2,11 @@
</span><span class="cx"> require_once dirname( dirname( __FILE__ ) ) . '/gp-load.php';
</span><span class="cx">
</span><span class="cx"> class GP_Script_Import_Originals extends GP_CLI {
</span><del>-
</del><ins>+
</ins><span class="cx"> var $short_options = 'p:f:o:';
</span><del>-
</del><ins>+
</ins><span class="cx"> var $usage = "-p <project-path> -f <file> [-o <format>]";
</span><del>-
</del><ins>+
</ins><span class="cx"> function run() {
</span><span class="cx"> if ( !isset( $this->options['p'] ) ) {
</span><span class="cx"> $this->usage();
</span></span></pre></div>
<a id="trunkscriptsimportphp"></a>
<div class="modfile"><h4>Modified: trunk/scripts/import.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/scripts/import.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/scripts/import.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -2,20 +2,20 @@
</span><span class="cx"> require_once dirname( dirname( __FILE__ ) ) . '/gp-load.php';
</span><span class="cx">
</span><span class="cx"> class GP_Script_Import extends GP_Translation_Set_Script {
</span><del>-
</del><ins>+
</ins><span class="cx"> function __construct() {
</span><span class="cx"> $this->short_options .= 'f:';
</span><span class="cx"> $this->usage = '-f <po-file> '.$this->usage;
</span><span class="cx"> parent::__construct();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function action_on_translation_set( $translation_set ) {
</span><span class="cx"> $po = new PO();
</span><span class="cx"> $po->import_from_file( $this->options['f'] );
</span><span class="cx"> $added = $translation_set->import( $po );
</span><span class="cx"> printf( _n( "%s translation were added\n", "%s translations were added\n", $added ), $added );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> $gp_script_import = new GP_Script_Import;
</span><span class="cx"> $gp_script_import->run();
</span></span></pre></div>
<a id="trunkscriptsrecheckwarningsphp"></a>
<div class="modfile"><h4>Modified: trunk/scripts/recheck-warnings.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/scripts/recheck-warnings.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/scripts/recheck-warnings.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> require_once dirname( dirname( __FILE__ ) ) . '/gp-load.php';
</span><span class="cx">
</span><span class="cx"> class GP_Script_Recheck_Warnings extends GP_Translation_Set_Script {
</span><del>-
</del><ins>+
</ins><span class="cx"> function action_on_translation_set( $translation_set ) {
</span><span class="cx"> $project = GP::$project->get( $translation_set->project_id );
</span><span class="cx"> $locale = GP_Locales::by_slug( $translation_set->locale );
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> $gp_script_recheck_warnings = new GP_Script_Recheck_Warnings;
</span><span class="cx"> $gp_script_recheck_warnings->run();
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkscriptsregeneratepathsphp"></a>
<div class="modfile"><h4>Modified: trunk/scripts/regenerate-paths.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/scripts/regenerate-paths.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/scripts/regenerate-paths.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> require_once dirname( dirname( __FILE__ ) ) . '/gp-load.php';
</span><span class="cx">
</span><span class="cx"> class GP_Script_Regenerate extends GP_CLI {
</span><del>-
</del><ins>+
</ins><span class="cx"> function run() {
</span><span class="cx"> GP::$project->regenerate_paths();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkscriptsremovemultiplecurrentsphp"></a>
<div class="modfile"><h4>Modified: trunk/scripts/remove-multiple-currents.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/scripts/remove-multiple-currents.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/scripts/remove-multiple-currents.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> require_once dirname( dirname( __FILE__ ) ) . '/gp-load.php';
</span><span class="cx">
</span><span class="cx"> class GP_Script extends GP_CLI {
</span><del>-
</del><ins>+
</ins><span class="cx"> function run() {
</span><span class="cx"> $sets = GP::$translation_set->all();
</span><span class="cx"> foreach( $sets as $set ) {
</span></span></pre></div>
<a id="trunkscriptsupgradesetpermissionsphp"></a>
<div class="modfile"><h4>Modified: trunk/scripts/upgrade-set-permissions.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/scripts/upgrade-set-permissions.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/scripts/upgrade-set-permissions.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> require_once dirname( dirname( __FILE__ ) ) . '/gp-load.php';
</span><span class="cx">
</span><span class="cx"> class GP_Script_Upgrade_Permissions extends GP_CLI {
</span><del>-
</del><ins>+
</ins><span class="cx"> function run() {
</span><span class="cx"> $permissions = GP::$permission->find_many( array( 'object_type' => 'translation-set', 'action' => 'approve' ) );
</span><span class="cx"> foreach( $permissions as $permission ) {
</span></span></pre></div>
<a id="trunkscriptswipepermissionsphp"></a>
<div class="modfile"><h4>Modified: trunk/scripts/wipe-permissions.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/scripts/wipe-permissions.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/scripts/wipe-permissions.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> require_once dirname( dirname( __FILE__ ) ) . '/gp-load.php';
</span><span class="cx">
</span><span class="cx"> class GP_Script_Wipe_Permissions extends GP_CLI {
</span><del>-
</del><ins>+
</ins><span class="cx"> function run() {
</span><span class="cx"> echo "This will erase all current permissions!\nAre you sure you want to delete them? [y/N]\n";
</span><span class="cx"> $response = fgets( STDIN );
</span></span></pre></div>
<a id="trunkscriptswporg2slugphp"></a>
<div class="modfile"><h4>Modified: trunk/scripts/wporg2slug.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/scripts/wporg2slug.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/scripts/wporg2slug.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -2,9 +2,9 @@
</span><span class="cx"> require_once dirname( dirname( __FILE__ ) ) . '/gp-load.php';
</span><span class="cx">
</span><span class="cx"> class GP_Script_WPorg2Slug extends GP_CLI {
</span><del>-
</del><ins>+
</ins><span class="cx"> var $usage = "<wporg-locale>";
</span><del>-
</del><ins>+
</ins><span class="cx"> function run() {
</span><span class="cx"> if ( !isset( $this->args[0] ) ) {
</span><span class="cx"> $this->usage();
</span></span></pre></div>
<a id="trunktallphp"></a>
<div class="modfile"><h4>Modified: trunk/t/all.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/all.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/all.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> for( $depth = 0; $depth <= 3; $depth++ ) {
</span><span class="cx"> foreach( glob( str_repeat( 'tests_*/', $depth ) . 'test_*.php' ) as $test_file ) {
</span><span class="cx"> include_once $test_file;
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class all {
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> $suite->addTestSuite( $class );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return $suite;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunktlibfactoryphp"></a>
<div class="modfile"><h4>Modified: trunk/t/lib/factory.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/lib/factory.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/lib/factory.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> $this->translation = new GP_UnitTest_Factory_For_Translation( $this );
</span><span class="cx"> $this->user = new GP_UnitTest_Factory_For_User( $this );
</span><span class="cx"> $this->locale = new GP_UnitTest_Factory_For_Locale( $this );
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class GP_UnitTest_Factory_For_Project extends GP_UnitTest_Factory_For_Thing {
</span><span class="lines">@@ -32,12 +32,12 @@
</span><span class="cx"> 'user_email' => new GP_UnitTest_Generator_Sequence( 'user_%s@example.org' ),
</span><span class="cx"> );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function create_admin( $args = array() ) {
</span><span class="cx"> $user = $this->create( $args );
</span><span class="cx"> GP::$permission->create( array( 'user_id' => $user->id, 'action' => 'admin' ) );
</span><span class="cx"> return $user;
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> 'translation_0' => new GP_UnitTest_Generator_Sequence( 'Translation %s' ),
</span><span class="cx"> );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function create_with_original_for_translation_set( $set, $args = array() ) {
</span><span class="cx"> $original = $this->factory->original->create( array( 'project_id' => $set->project_id ) );
</span><span class="cx"> $translation = $this->create( array_merge( $args, array( 'original_id' => $original->id, 'translation_set_id' => $set->id ) ) );
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> 'english_name' => new GP_UnitTest_Generator_Sequence( 'Locale %s' ),
</span><span class="cx"> );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function create( $args = array(), $generation_definitions = null ) {
</span><span class="cx"> if ( is_null( $generation_definitions ) ) $generation_definitions = $this->default_generation_definitions;
</span><span class="cx"> $generated_args = $this->generate_args( $args, $generation_definitions, $callbacks );
</span><span class="lines">@@ -113,11 +113,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class GP_UnitTest_Factory_For_Thing {
</span><del>-
</del><ins>+
</ins><span class="cx"> var $default_generation_definitions;
</span><span class="cx"> var $thing;
</span><span class="cx"> var $factory;
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Creates a new factory, which will create objects of a specific Thing
</span><span class="cx"> *
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> $this->default_generation_definitions = $default_generation_definitions;
</span><span class="cx"> $this->thing = $thing;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function create( $args = array(), $generation_definitions = null ) {
</span><span class="cx"> if ( is_null( $generation_definitions ) ) $generation_definitions = $this->default_generation_definitions;
</span><span class="cx"> $generated_args = $this->generate_args( $args, $generation_definitions, $callbacks );
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> }
</span><span class="cx"> return $created;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function generate_args( $args = array(), $generation_definitions = null, &$callbacks = null ) {
</span><span class="cx"> $callbacks = array();
</span><span class="cx"> if ( is_null( $generation_definitions ) ) $generation_definitions = $this->default_generation_definitions;
</span><span class="lines">@@ -163,12 +163,12 @@
</span><span class="cx"> $args[$field_name] = $generator->next();
</span><span class="cx"> else
</span><span class="cx"> return new WP_Error( 'invalid_argument', 'Factory default value should be either a scalar or an generator object.' );
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return $args;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function apply_callbacks( $callbacks, $created ) {
</span><span class="cx"> $updated_fields = array();
</span><span class="cx"> foreach( $callbacks as $field_name => $generator ) {
</span><span class="lines">@@ -176,21 +176,21 @@
</span><span class="cx"> }
</span><span class="cx"> return $updated_fields;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function callback( $function ) {
</span><span class="cx"> return new GP_UnitTest_Factory_Callback_After_Create( $function );
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class GP_UnitTest_Generator_Sequence {
</span><span class="cx"> var $next;
</span><span class="cx"> var $template_string;
</span><del>-
</del><ins>+
</ins><span class="cx"> function __construct( $template_string = '%s', $start = 1 ) {
</span><span class="cx"> $this->next = $start;
</span><span class="cx"> $this->template_string = $template_string;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function next() {
</span><span class="cx"> $generated = sprintf( $this->template_string , $this->next );
</span><span class="cx"> $this->next++;
</span></span></pre></div>
<a id="trunktlibtestcaseroutephp"></a>
<div class="modfile"><h4>Modified: trunk/t/lib/testcase-route.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/lib/testcase-route.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/lib/testcase-route.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> class GP_UnitTestCase_Route extends GP_UnitTestCase {
</span><span class="cx"> var $route;
</span><span class="cx"> var $route_class;
</span><del>-
</del><ins>+
</ins><span class="cx"> function setUp() {
</span><span class="cx"> parent::setUp();
</span><span class="cx"> $this->route = new $this->route_class;
</span><span class="lines">@@ -11,14 +11,14 @@
</span><span class="cx"> $this->cookies = array();
</span><span class="cx"> $this->route->errors = array();
</span><span class="cx"> $this->route->notices = array();
</span><del>- add_filter( 'backpress_set_cookie', array( &$this, 'filter_do_not_set_cookie' ) );
</del><ins>+ add_filter( 'backpress_set_cookie', array( &$this, 'filter_do_not_set_cookie' ) );
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function tearDown() {
</span><span class="cx"> parent::tearDown();
</span><span class="cx"> remove_filter( 'backpress_set_cookie', array( &$this, 'filter_do_not_set_cookie' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function filter_do_not_set_cookie( $args ) {
</span><span class="cx"> if ( isset( $args[0] ) && !isset( $args[1] ) && isset( $this->cookies[$args[0]] ) ) {
</span><span class="cx"> unset( $this->cookies[$args[0]] );
</span><span class="lines">@@ -28,16 +28,16 @@
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function assertRedirected() {
</span><span class="cx"> $this->assertTrue( $this->route->redirected, "Wasn't redirected" );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function assertRedirectURLContains( $text ) {
</span><span class="cx"> $this->assertRedirected();
</span><span class="cx"> $this->assertContains( $text, $this->route->redirected_to );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function assertThereIsAnErrorContaining( $text ) {
</span><span class="cx"> $this->assertThereIsAnArrayElementContaining( $text, $this->route->errors, "No error contains '$text'" );
</span><span class="cx"> }
</span><span class="lines">@@ -45,19 +45,19 @@
</span><span class="cx"> function assertThereIsANoticeContaining( $text ) {
</span><span class="cx"> $this->assertThereIsAnArrayElementContaining( $text, $this->route->notices, "No notice contains '$text'" );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function assertThereIsAnArrayElementContaining( $text, $array, $message = null ) {
</span><span class="cx"> $this->assertGreaterThan( 0, count( $array ), 'The array is empty.' );
</span><span class="cx"> $message = $message? $message : "No array element contains '$text'";
</span><span class="cx"> $this->assertTrue( gp_array_any( lambda( '$e', 'gp_in( $text, $e ); ', compact('text') ), $array ), $message );
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function assertNotAllowedRedirect() {
</span><span class="cx"> $this->assertRedirected();
</span><span class="cx"> $this->assertThereIsAnErrorContaining( 'allowed' );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function assertInvalidRedirect() {
</span><span class="cx"> $this->assertRedirected();
</span><span class="cx"> $this->assertThereIsAnErrorContaining( 'invalid' );
</span><span class="lines">@@ -67,16 +67,16 @@
</span><span class="cx"> $this->assertRedirected();
</span><span class="cx"> $this->assertThereIsAnErrorContaining( 'Error' );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function assertTemplateLoadedIs( $template ) {
</span><span class="cx"> $this->assertTrue( $this->route->rendered_template, "No template was rendered" );
</span><span class="cx"> $this->assertEquals( $template, $this->route->loaded_template );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function assertTemplateOutputNotEmpty() {
</span><span class="cx"> $this->assertFalse( empty( $this->route->template_output ), "Template output is empty" );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function assert404() {
</span><span class="cx"> $this->assertTemplateLoadedIs( '404' );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunktlibtestcasephp"></a>
<div class="modfile"><h4>Modified: trunk/t/lib/testcase.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/lib/testcase.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/lib/testcase.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -57,12 +57,12 @@
</span><span class="cx"> GP::$translation_set = new GP_Translation_Set;
</span><span class="cx"> GP::$original = new GP_Original;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function start_transaction() {
</span><span class="cx"> global $gpdb;
</span><span class="cx"> $gpdb->query( 'SET autocommit = 0;' );
</span><span class="cx"> $gpdb->query( 'SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE;' );
</span><del>- $gpdb->query( 'START TRANSACTION;' );
</del><ins>+ $gpdb->query( 'START TRANSACTION;' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function temp_filename() {
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> $dir = realpath( $dir );
</span><span class="cx"> return tempnam( $dir, 'testpomo' );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function set_normal_user_as_current() {
</span><span class="cx"> $user = $this->factory->user->create();
</span><span class="cx"> $user->set_as_current();
</span><span class="lines">@@ -89,19 +89,19 @@
</span><span class="cx"> $admin->set_as_current();
</span><span class="cx"> return $admin;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function assertWPError( $actual, $message = '' ) {
</span><span class="cx"> $this->assertTrue( is_wp_error( $actual ), $message );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function assertEqualFields( $object, $fields ) {
</span><span class="cx"> foreach( $fields as $field_name => $field_value ) {
</span><span class="cx"> if ( $object->$field_name != $field_value ) {
</span><span class="cx"> $this->fail();
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function assertDiscardWhitespace( $expected, $actual ) {
</span><span class="cx"> $this->assertEquals( preg_replace( '/\s*/', '', $expected ), preg_replace( '/\s*/', '', $actual ) );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkttest_format_androidphp"></a>
<div class="modfile"><h4>Modified: trunk/t/test_format_android.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/test_format_android.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/test_format_android.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -13,9 +13,9 @@
</span><span class="cx"> array('with_lt', 'you < me', 'ти < аз'),
</span><span class="cx"> array('with_gt', 'me > you', "аз > ти"),
</span><span class="cx"> array('with_amps', 'me & you are not &amp;', 'аз & ти не сме &amp;'),
</span><del>- );
</del><ins>+ );
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_export() {
</span><span class="cx"> $entries_for_export = array();
</span><span class="cx"> foreach( $this->entries as $sample ) {
</span><span class="lines">@@ -28,11 +28,11 @@
</span><span class="cx"> }
</span><span class="cx"> $this->assertEquals( file_get_contents( 'data/translation.android.xml' ), $this->android->print_exported_file( 'p', 'l', 't', $entries_for_export ) );
</span><span class="cx"> }
</span><del>-
-
</del><ins>+
+
</ins><span class="cx"> function test_read_originals() {
</span><span class="cx"> $translations = $this->android->read_originals_from_file( 'data/originals.android.xml' );
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach( $this->entries as $sample ) {
</span><span class="cx"> list( $context, $original, $translation ) = $sample;
</span><span class="cx"> $translatable_entry = new Translation_Entry( array('singular' => $original, 'context' => $context) );
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> $this->assertEquals( $context, $entry->context );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_read_translations() {
</span><span class="cx"> $stubbed_originals = array();
</span><span class="cx"> foreach( $this->entries as $sample ) {
</span><span class="lines">@@ -59,5 +59,5 @@
</span><span class="cx"> $this->assertEquals( $translation, $translations->translate( $original, $context ) );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkttest_format_resxphp"></a>
<div class="modfile"><h4>Modified: trunk/t/test_format_resx.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/test_format_resx.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/test_format_resx.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -14,9 +14,9 @@
</span><span class="cx"> array('with_gt', 'me > you', "аз > ти", ''),
</span><span class="cx"> array('with_amps', 'me & you are not &amp;', 'аз & ти не сме &amp;', ''),
</span><span class="cx"> array('with_comment', 'baba', 'баба', 'Me, myself & Irene'),
</span><del>- );
</del><ins>+ );
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_export() {
</span><span class="cx"> $entries_for_export = array();
</span><span class="cx"> foreach( $this->entries as $sample ) {
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx"> }
</span><span class="cx"> $this->assertEquals( file_get_contents( 'data/translation.resx.xml' ), $this->resx->print_exported_file( 'p', 'l', 't', $entries_for_export ) );
</span><span class="cx"> }
</span><del>-
-
</del><ins>+
+
</ins><span class="cx"> function test_read_originals() {
</span><span class="cx"> $translations = $this->resx->read_originals_from_file( 'data/originals.resx.xml' );
</span><span class="cx"> $this->assertEquals( count($this->entries ), count( $translations->entries ), 'number of read originals is different from the expected' );
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> $this->assertEquals( $comment, $entry->extracted_comments );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_read_translations() {
</span><span class="cx"> $stubbed_originals = array();
</span><span class="cx"> foreach( $this->entries as $sample ) {
</span></span></pre></div>
<a id="trunkttest_format_rrcphp"></a>
<div class="modfile"><h4>Modified: trunk/t/test_format_rrc.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/test_format_rrc.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/test_format_rrc.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> array('MULTIPLE_UNTRANSLATED[1]', 'English string#1', ''),
</span><span class="cx"> );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_export() {
</span><span class="cx"> $entries_for_export = array();
</span><span class="cx"> foreach( $this->entries as $sample ) {
</span><span class="lines">@@ -33,19 +33,19 @@
</span><span class="cx"> $this->rrc->print_exported_file( 'project', 'locale', 'translation_set', $entries_for_export )
</span><span class="cx"> );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_read_originals() {
</span><span class="cx"> $translations = $this->rrc->read_originals_from_file( 'data/originals.rrc' );
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach( $this->entries as $sample ) {
</span><span class="cx"> list( $context, $original, $translation ) = $sample;
</span><span class="cx"> $translatable_entry = new Translation_Entry( array('singular' => $original, 'context' => $context) );
</span><span class="cx"> $entry = $translations->translate_entry( $translatable_entry );
</span><span class="cx"> $this->assertEquals( $original, $entry->singular );
</span><del>- $this->assertEquals( $context, $entry->context );
</del><ins>+ $this->assertEquals( $context, $entry->context );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_read_translations() {
</span><span class="cx"> $stubbed_originals = array();
</span><span class="cx"> foreach( $this->entries as $sample ) {
</span><span class="lines">@@ -62,5 +62,5 @@
</span><span class="cx"> list( $context, $original, $translation ) = $sample;
</span><span class="cx"> $this->assertEquals( $translation, $translations->translate( $original, $context ) );
</span><span class="cx"> }
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkttest_linksphp"></a>
<div class="modfile"><h4>Modified: trunk/t/test_links.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/test_links.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/test_links.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -2,11 +2,11 @@
</span><span class="cx"> require_once('init.php');
</span><span class="cx">
</span><span class="cx"> class GP_Test_Links extends GP_UnitTestCase {
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_link_get_simple() {
</span><span class="cx"> $this->assertEquals( '<a href="http://dir.bg/">Baba</a>', gp_link_get( 'http://dir.bg/', 'Baba' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_link_get_attributes() {
</span><span class="cx"> $this->assertEquals( '<a href="http://dir.bg/" target="_blank" class="edit">Baba</a>',
</span><span class="cx"> gp_link_get( 'http://dir.bg/', 'Baba', array( 'target' => '_blank', 'class' => 'edit' ) ) );
</span><span class="lines">@@ -19,11 +19,11 @@
</span><span class="cx"> function test_gp_link_get_should_put_the_after_attribute_after_the_link() {
</span><span class="cx"> $this->assertEquals( '<a href="http://dir.bg/">Baba</a>x', gp_link_get( 'http://dir.bg/', 'Baba', array( 'after' => 'x' ) ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_link_get_should_put_the_before_and_after_attributes_before_and_after_the_link() {
</span><span class="cx"> $this->assertEquals( 'a<a href="http://dir.bg/">Baba</a>b', gp_link_get( 'http://dir.bg/', 'Baba', array( 'before' => 'a', 'after' => 'b' ) ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_link_get_escape() {
</span><span class="cx"> $this->assertEquals( '<a href="http://dir.bg/">Baba & Dyado</a>', gp_link_get( 'http://dir.bg/', 'Baba & Dyado' ) );
</span><span class="cx"> // clean_url() is too restrictive, so it isn't called
</span></span></pre></div>
<a id="trunkttest_miscphp"></a>
<div class="modfile"><h4>Modified: trunk/t/test_misc.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/test_misc.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/test_misc.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -14,13 +14,13 @@
</span><span class="cx"> $this->assertEquals( "odd", $gen() );
</span><span class="cx"> $this->assertEquals( "odd", $concurrent() );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_array_flatten() {
</span><span class="cx"> $this->assertEquals( array(), gp_array_flatten( array() ) );
</span><span class="cx"> $this->assertEquals( array( 1, 2, 3 ), gp_array_flatten( array( 1, array( 2, 3 ) ) ) );
</span><span class="cx"> $this->assertEquals( array( 1, 2, 3, 4, 5, 6, 7 ), gp_array_flatten( array( 1, array( 2, array( 3, 4 ), 5, ), 6, array( 7 ) ) ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_array_zip() {
</span><span class="cx"> $this->assertEquals( array(), gp_array_zip() );
</span><span class="cx"> $this->assertEquals( array(), gp_array_zip( array() ) );
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> $this->assertEquals( array( array('baba', 'dyado') ), gp_array_zip( array('baba', 'boom'), array('dyado') ) );
</span><span class="cx"> $this->assertEquals( array( array( array('baba'), 'dyado') ), gp_array_zip( array( array('baba'), 'boom'), array('dyado') ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_array_any() {
</span><span class="cx"> $this->assertEquals( false, gp_array_any( 'intval', array( 0 ) ) );
</span><span class="cx"> $this->assertEquals( false, gp_array_any( returner(false), array( 1, 2, 3, 4 ) ) );
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> $this->assertEquals( true, gp_array_any( returner(true), array( 1, 2, 3, 4 ) ) );
</span><span class="cx"> $this->assertEquals( true, gp_array_any( returner('$x', '$x % 2'), array( 1, 2, 3, 4 ) ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_object_has_var_returs_true_if_var_is_null() {
</span><span class="cx"> $this->assertTrue( gp_object_has_var( (object)array( 'baba' => null), 'baba' ) );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkttest_mophp"></a>
<div class="modfile"><h4>Modified: trunk/t/test_mo.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/test_mo.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/test_mo.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> $this->assertEquals('oney dragoney', $mo->translate_plural('one dragon', '%d dragons', 1));
</span><span class="cx"> $this->assertEquals('manyey dragoney', $mo->translate_plural('one dragon', '%d dragons', 11));
</span><span class="cx"> $this->assertEquals('twoey dragoney', $mo->translate_plural('one dragon', '%d dragons', 3));
</span><del>-
</del><ins>+
</ins><span class="cx"> $mo->set_header('Plural-Forms', 'nplurals=2; plural=n !=1;');
</span><span class="cx"> $this->assertEquals('oney dragoney', $mo->translate_plural('one dragon', '%d dragons', 1));
</span><span class="cx"> $this->assertEquals('twoey dragoney', $mo->translate_plural('one dragon', '%d dragons', 2));
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> $this->assertEquals("not so dragon", $mo->entries[$single_entry->key()]->context);
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_translations_merge() {
</span><span class="cx"> $host = new Translations();
</span><span class="cx"> $host->add_entry(new Translation_Entry(array('singular' => 'pink',)));
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> $this->assertEquals(3, count($host->entries));
</span><span class="cx"> $this->assertEquals(array(), array_diff(array('pink', 'green', 'red'), array_keys($host->entries)));
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_export_mo_file() {
</span><span class="cx"> $entries = array();
</span><span class="cx"> $entries[] = new Translation_Entry(array('singular' => 'pink',
</span><span class="lines">@@ -85,10 +85,10 @@
</span><span class="cx"> $mo->add_entry($entry);
</span><span class="cx"> }
</span><span class="cx"> $mo->add_entry($no_translation_entry);
</span><del>-
</del><ins>+
</ins><span class="cx"> $temp_fn = $this->temp_filename();
</span><span class="cx"> $mo->export_to_file($temp_fn);
</span><del>-
</del><ins>+
</ins><span class="cx"> $again = new MO();
</span><span class="cx"> $again->import_from_file($temp_fn);
</span><span class="cx">
</span><span class="lines">@@ -97,12 +97,12 @@
</span><span class="cx"> $this->assertEquals($entry, $again->entries[$entry->key()]);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_export_should_not_include_empty_translations() {
</span><span class="cx"> $entries = array( );
</span><span class="cx"> $mo = new MO;
</span><span class="cx"> $mo->add_entry( array( 'singular' => 'baba', 'translations' => array( '', '' ) ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> $temp_fn = $this->temp_filename();
</span><span class="cx"> $mo->export_to_file( $temp_fn );
</span><span class="cx">
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx">
</span><span class="cx"> $this->assertEquals( 0, count( $again->entries ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_nplurals_with_backslashn() {
</span><span class="cx"> $mo = new MO();
</span><span class="cx"> $mo->import_from_file('data/bad_nplurals.mo');
</span><span class="lines">@@ -119,14 +119,14 @@
</span><span class="cx"> $this->assertEquals('%d foros', $mo->translate_plural('%d forum', '%d forums', 2));
</span><span class="cx"> $this->assertEquals('%d foros', $mo->translate_plural('%d forum', '%d forums', -1));
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function disabled_test_performance() {
</span><span class="cx"> $start = microtime(true);
</span><span class="cx"> $mo = new MO();
</span><span class="cx"> $mo->import_from_file('data/de_DE-2.8.mo');
</span><span class="cx"> // echo "\nPerformance: ".(microtime(true) - $start)."\n";
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_overloaded_mb_functions() {
</span><span class="cx"> // skipIf() method skips the whole test case, not only this method
</span><span class="cx"> // that's why we are skipping it the stupid way
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> $this->assertEquals(array('Табло'), $mo->entries['Dashboard']->translations);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_load_pot_file() {
</span><span class="cx"> $mo = new MO();
</span><span class="cx"> $this->assertEquals( false, $mo->import_from_file('data/mo.pot') );
</span></span></pre></div>
<a id="trunkttest_noop_translationsphp"></a>
<div class="modfile"><h4>Modified: trunk/t/test_noop_translations.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/test_noop_translations.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/test_noop_translations.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -8,31 +8,31 @@
</span><span class="cx"> $this->entry = new Translation_Entry( array( 'singular' => 'baba' ) );
</span><span class="cx"> $this->plural_entry = new Translation_Entry(array('singular' => 'dyado', 'plural' => 'dyados', 'translations' => array('dyadox', 'dyadoy')));
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_get_header() {
</span><span class="cx"> $this->assertEquals( false, $this->noop->get_header( 'Content-Type' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_add_entry() {
</span><span class="cx"> $this->noop->add_entry( $this->entry );
</span><span class="cx"> $this->assertEquals( array(), $this->noop->entries );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_set_header() {
</span><span class="cx"> $this->noop->set_header( 'header', 'value' );
</span><span class="cx"> $this->assertEquals( array(), $this->noop->headers );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_translate_entry() {
</span><span class="cx"> $this->noop->add_entry( $this->entry );
</span><span class="cx"> $this->assertEquals( false, $this->noop->translate_entry( $this->entry ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_translate() {
</span><span class="cx"> $this->noop->add_entry( $this->entry );
</span><span class="cx"> $this->assertEquals( 'baba', $this->noop->translate( 'baba' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_plural() {
</span><span class="cx"> $this->noop->add_entry( $this->plural_entry );
</span><span class="cx"> $this->assertEquals( 'dyado', $this->noop->translate_plural( 'dyado', 'dyados', 1 ) );
</span></span></pre></div>
<a id="trunkttest_permissionsphp"></a>
<div class="modfile"><h4>Modified: trunk/t/test_permissions.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/test_permissions.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/test_permissions.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> $from_db = GP::$permission->find_one( $args );
</span><span class="cx"> $this->assertEqualPermissions( $args, $from_db );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_create_find_with_nulls() {
</span><span class="cx"> $args = array( 'user_id' => 2, 'action' => 'write', 'object_type' => 'translation-set', );
</span><span class="cx"> GP::$permission->create( array_merge( $args, array( 'object_id' => 11 ) ) );
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> $from_db = GP::$permission->find_one( $args );
</span><span class="cx"> $this->assertEqualPermissions( $args, $from_db );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_logged_out_permissions() {
</span><span class="cx"> $this->assertFalse( (bool)GP::$user->current()->can( 'admin' ) );
</span><span class="cx"> $this->assertFalse( (bool)GP::$user->current()->can( 'write', 'project', 1 ) );
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> $other = GP::$project->create( array( 'name' => 'Other', 'slug' => 'other', 'path' => 'other') );
</span><span class="cx"> $root = GP::$project->create( array( 'name' => 'Root', 'slug' => 'root', 'path' => 'root') );
</span><span class="cx"> $sub = GP::$project->create( array( 'name' => 'Sub', 'slug' => 'sub', 'parent_project_id' => $root->id, 'path' => 'root/sub' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> GP::$permission->create( array( 'user_id' => $user->id, 'action' => 'write', 'object_type' => 'project', 'object_id' => $root->id ) );
</span><span class="cx"> $this->assertTrue( (bool)$user->can( 'write', 'project', $root->id ) );
</span><span class="cx"> $this->assertTrue( (bool)$user->can( 'write', 'project', $sub->id ) );
</span><span class="lines">@@ -39,14 +39,14 @@
</span><span class="cx"> $object_type = GP::$validator_permission->object_type;
</span><span class="cx"> $action = 'whatever';
</span><span class="cx"> $user = GP::$user->create( array( 'user_login' => 'gugu', 'user_email' => 'gugu@gugu.net' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> $other = GP::$project->create( array( 'name' => 'Other', 'slug' => 'other', 'path' => 'other') );
</span><span class="cx"> $root = GP::$project->create( array( 'name' => 'Root', 'slug' => 'root', 'path' => 'root') );
</span><span class="cx"> $sub = GP::$project->create( array( 'name' => 'Sub', 'slug' => 'sub', 'parent_project_id' => $root->id, 'path' => 'root/sub' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> GP::$validator_permission->create( array( 'user_id' => $user->id, 'action' => 'whatever',
</span><span class="cx"> 'project_id' => $root->id, 'locale_slug' => 'bg', 'set_slug' => 'default' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> $this->assertTrue( (bool)$user->can( 'whatever', $object_type, GP::$validator_permission->object_id( $root->id, 'bg', 'default' ) ) );
</span><span class="cx"> $this->assertTrue( (bool)$user->can( 'whatever', $object_type, GP::$validator_permission->object_id( $sub->id, 'bg', 'default' ) ) );
</span><span class="cx"> $this->assertTrue( (bool)$user->can( 'whatever', $object_type, GP::$validator_permission->object_id( $sub->id, 'bg', 'default' ) ) );
</span><span class="lines">@@ -58,14 +58,14 @@
</span><span class="cx">
</span><span class="cx"> function test_approve_translation_set_permissions() {
</span><span class="cx"> $user = GP::$user->create( array( 'user_login' => 'gugu', 'user_email' => 'gugu@gugu.net' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> $other = GP::$project->create( array( 'name' => 'Other', 'slug' => 'other', 'path' => 'other') );
</span><span class="cx"> $root = GP::$project->create( array( 'name' => 'Root', 'slug' => 'root', 'path' => 'root') );
</span><span class="cx"> $sub = GP::$project->create( array( 'name' => 'Sub', 'slug' => 'sub', 'parent_project_id' => $root->id, 'path' => 'root/sub' ) );
</span><span class="cx">
</span><span class="cx"> GP::$validator_permission->create( array( 'user_id' => $user->id, 'action' => 'approve',
</span><span class="cx"> 'project_id' => $root->id, 'locale_slug' => 'bg', 'set_slug' => 'default' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> $set_root_bg = GP::$translation_set->create( array( 'name' => 'Set', 'slug' => 'default', 'project_id' => $root->id, 'locale' => 'bg') );
</span><span class="cx"> $set_sub_bg = GP::$translation_set->create( array( 'name' => 'Set', 'slug' => 'default', 'project_id' => $sub->id, 'locale' => 'bg') );
</span><span class="cx"> $set_root_en = GP::$translation_set->create( array( 'name' => 'Set', 'slug' => 'default', 'project_id' => $root->id, 'locale' => 'en') );
</span><span class="lines">@@ -78,9 +78,9 @@
</span><span class="cx"> $this->assertFalse( (bool)$user->can( 'approve', 'translation-set', $set_root_bg_slug->id ) );
</span><span class="cx"> $this->assertFalse( (bool)$user->can( 'approve', 'translation-set', $set_other_bg->id ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function assertEqualPermissions( $expected, $actual ) {
</span><span class="cx"> $fields = $actual->fields();
</span><span class="cx"> unset($fields['id']);
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkttest_pophp"></a>
<div class="modfile"><h4>Modified: trunk/t/test_po.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/test_po.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/test_po.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> function test_poify() {
</span><span class="cx"> //simple
</span><span class="cx"> $this->assertEquals('"baba"', PO::poify('baba'));
</span><del>- //long word
</del><ins>+ //long word
</ins><span class="cx"> $this->assertEquals($this->po_a90, PO::poify($this->a90));
</span><span class="cx"> // tab
</span><span class="cx"> $this->assertEquals('"ba\tba"', PO::poify("ba\tba"));
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> $this->assertEquals($this->po_mail, PO::poify($this->mail));
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_unpoify() {
</span><span class="cx"> $this->assertEquals('baba', PO::unpoify('"baba"'));
</span><span class="cx"> $this->assertEquals("baba\ngugu", PO::unpoify('"baba\n"'."\t\t\t\n".'"gugu"'));
</span><span class="lines">@@ -171,48 +171,48 @@
</span><span class="cx"> $po->export_to_file($temp_fn2);
</span><span class="cx"> $this->assertEquals($po->export(), file_get_contents($temp_fn2));
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_import_from_file() {
</span><span class="cx"> $po = new PO();
</span><span class="cx"> $res = $po->import_from_file('data/simple.po');
</span><span class="cx"> $this->assertEquals(true, $res);
</span><span class="cx">
</span><span class="cx"> $this->assertEquals(array('Project-Id-Version' => 'WordPress 2.6-bleeding', 'Plural-Forms' => 'nplurals=2; plural=n != 1;'), $po->headers);
</span><del>-
</del><ins>+
</ins><span class="cx"> $simple_entry = new Translation_Entry(array('singular' => 'moon',));
</span><span class="cx"> $this->assertEquals($simple_entry, $po->entries[$simple_entry->key()]);
</span><del>-
</del><ins>+
</ins><span class="cx"> $all_types_entry = new Translation_Entry(array('singular' => 'strut', 'plural' => 'struts', 'context' => 'brum',
</span><span class="cx"> 'translations' => array('ztrut0', 'ztrut1', 'ztrut2')));
</span><span class="cx"> $this->assertEquals($all_types_entry, $po->entries[$all_types_entry->key()]);
</span><del>-
</del><ins>+
</ins><span class="cx"> $multiple_line_entry = new Translation_Entry(array('singular' => 'The first thing you need to do is tell Blogger to let WordPress access your account. You will be sent back here after providing authorization.', 'translations' => array("baba\ndyadogugu")));
</span><span class="cx"> $this->assertEquals($multiple_line_entry, $po->entries[$multiple_line_entry->key()]);
</span><del>-
</del><ins>+
</ins><span class="cx"> $multiple_line_all_types_entry = new Translation_Entry(array('context' => 'context', 'singular' => 'singular',
</span><span class="cx"> 'plural' => 'plural', 'translations' => array('translation0', 'translation1', 'translation2')));
</span><span class="cx"> $this->assertEquals($multiple_line_all_types_entry, $po->entries[$multiple_line_all_types_entry->key()]);
</span><del>-
</del><ins>+
</ins><span class="cx"> $comments_entry = new Translation_Entry(array('singular' => 'a', 'translator_comments' => "baba\nbrubru",
</span><span class="cx"> 'references' => array('wp-admin/x.php:111', 'baba:333', 'baba'), 'extracted_comments' => "translators: buuu",
</span><span class="cx"> 'flags' => array('fuzzy')));
</span><span class="cx"> $this->assertEquals($comments_entry, $po->entries[$comments_entry->key()]);
</span><del>-
</del><ins>+
</ins><span class="cx"> $end_quote_entry = new Translation_Entry(array('singular' => 'a"'));
</span><span class="cx"> $this->assertEquals($end_quote_entry, $po->entries[$end_quote_entry->key()]);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_import_from_entry_file_should_give_false() {
</span><span class="cx"> $po = new PO();
</span><span class="cx"> $this->assertFalse( $po->import_from_file( 'data/empty.po' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_import_from_file_with_windows_line_endings_should_work_as_with_unix_line_endings() {
</span><span class="cx"> $po = new PO();
</span><span class="cx"> $this->assertTrue( $po->import_from_file( 'data/windows-line-endings.po' ) );
</span><span class="cx"> $this->assertEquals( 1, count( $po->entries ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> //TODO: add tests for bad files
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkttest_templatephp"></a>
<div class="modfile"><h4>Modified: trunk/t/test_template.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/test_template.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/test_template.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> function test_gp_breadcrumb_should_return_empty_string_without_params() {
</span><span class="cx"> $this->assertEquals( '', gp_breadcrumb() );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_breadcrumb_should_run_empty_string_through_filter_without_params() {
</span><span class="cx"> $filter = $this->getMock('Dummy', array('breadcrumb_filter'));
</span><span class="cx"> $filter->expects( $this->once() )->method( 'breadcrumb_filter' )->with( $this->equalTo( '' ) );
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> gp_breadcrumb();
</span><span class="cx"> remove_filter( 'gp_breadcrumb', array( &$filter, 'breadcrumb_filter') );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_breadcrumb_should_join_all_crumbs() {
</span><span class="cx"> gp_breadcrumb( array( 'baba', 'dyado'), array( 'separator' => '', 'breadcrumb-template' => '{breadcrumb}' ) );
</span><span class="cx"> $this->assertEquals( 'babadyado', gp_breadcrumb() );
</span><span class="lines">@@ -29,10 +29,10 @@
</span><span class="cx"> $this->assertEquals( '---xxx---baba---dyado', gp_breadcrumb() );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_breadcrumb_should_flatten_the_given_array_of_crumbs() {
</span><span class="cx"> gp_breadcrumb( array( 'baba', array( 'dyado' ), 'muu' ), array( 'separator' => '', 'breadcrumb-template' => '{breadcrumb}' ) );
</span><span class="cx"> $this->assertEquals( 'babadyadomuu', gp_breadcrumb() );
</span><del>-
- }
</del><ins>+
+ }
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkttest_thingphp"></a>
<div class="modfile"><h4>Modified: trunk/t/test_thing.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/test_thing.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/test_thing.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -9,12 +9,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class GP_Test_Thing extends GP_UnitTestCase {
</span><del>-
</del><ins>+
</ins><span class="cx"> function setUp() {
</span><span class="cx"> parent::setUp();
</span><span class="cx"> $this->t = new GP_My_Table;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_sql_condition_from_php_value() {
</span><span class="cx"> $this->assertEquals( '= 5', $this->t->sql_condition_from_php_value( 5 ) );
</span><span class="cx"> $this->assertEquals( '= 5', $this->t->sql_condition_from_php_value( '5' ) );
</span><span class="lines">@@ -23,12 +23,12 @@
</span><span class="cx"> $this->assertEquals( array('= 5', '= 10'), $this->t->sql_condition_from_php_value( array( 5, 10 ) ) );
</span><span class="cx"> $this->assertEquals( array("= 'baba'", "= 10", "= 'don\\'t'"), $this->t->sql_condition_from_php_value( array( 'baba', '10', "don't" ) ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_sql_from_conditions() {
</span><span class="cx"> $this->assertEquals( 'a = 5', $this->t->sql_from_conditions( array('a' => 5) ) );
</span><span class="cx"> $this->assertEquals( "(a = 5 OR a = 6) AND b = 'baba'", $this->t->sql_from_conditions( array('a' => array(5, 6), 'b' => 'baba' ) ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_sql_from_order() {
</span><span class="cx"> $this->assertEquals( '', $this->t->sql_from_order( null ) );
</span><span class="cx"> $this->assertEquals( '', $this->t->sql_from_order( '' ) );
</span></span></pre></div>
<a id="trunkttest_translation_entryphp"></a>
<div class="modfile"><h4>Modified: trunk/t/test_translation_entry.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/test_translation_entry.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/test_translation_entry.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> require_once('init.php');
</span><span class="cx">
</span><span class="cx"> class GP_Test_Translation_Entry extends GP_UnitTestCase {
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_create_entry() {
</span><span class="cx"> // no singular => empty object
</span><span class="cx"> $entry = new Translation_Entry();
</span></span></pre></div>
<a id="trunkttest_translationsphp"></a>
<div class="modfile"><h4>Modified: trunk/t/test_translations.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/test_translations.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/test_translations.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> // add empty entry
</span><span class="cx"> $this->assertEquals(false, $po->add_entry($empty));
</span><span class="cx"> $this->assertEquals(array($entry->key() => $entry, $entry2->key() => $entry2), $po->entries);
</span><del>-
</del><ins>+
</ins><span class="cx"> // give add_entry() the arguments and let it create the entry itself
</span><span class="cx"> $po = new Translations();
</span><span class="cx"> $po->add_entry(array('singular' => 'baba',));
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> $this->assertEquals('dyadoy', $domain->translate_plural('dyado', 'dyados', 18881));
</span><span class="cx"> $this->assertEquals('dyadoy', $domain->translate_plural('dyado', 'dyados', -18881));
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_digit_and_merge() {
</span><span class="cx"> $entry_digit_1 = new Translation_Entry(array('singular' => 1, 'translations' => array('1')));
</span><span class="cx"> $entry_digit_2 = new Translation_Entry(array('singular' => 2, 'translations' => array('2')));
</span></span></pre></div>
<a id="trunkttest_urlsphp"></a>
<div class="modfile"><h4>Modified: trunk/t/test_urls.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/test_urls.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/test_urls.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -2,20 +2,20 @@
</span><span class="cx"> require_once('init.php');
</span><span class="cx">
</span><span class="cx"> class GP_Test_Urls extends GP_UnitTestCase {
</span><del>-
</del><ins>+
</ins><span class="cx"> function setUp() {
</span><span class="cx"> $this->sub_dir = '/gp/';
</span><span class="cx"> $this->url = 'http://example.org' . $this->sub_dir;
</span><span class="cx"> parent::setUp();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_url_should_just_add_simple_path_string_if_query_is_missing() {
</span><span class="cx"> $this->assertEquals( $this->sub_dir . 'baba', gp_url( 'baba' ) );
</span><span class="cx"> }
</span><span class="cx"> function test_gp_url_should_not_add_query_string_if_query_is_empty_string() {
</span><span class="cx"> $this->assertEquals( $this->sub_dir . 'baba', gp_url( 'baba', '' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_url_should_not_add_query_string_if_query_is_empty_array() {
</span><span class="cx"> $this->assertEquals( $this->sub_dir . 'baba', gp_url( 'baba', array() ) );
</span><span class="cx"> }
</span><span class="lines">@@ -27,11 +27,11 @@
</span><span class="cx"> function test_gp_url_should_add_question_mark_if_query_string_does_not_have_one() {
</span><span class="cx"> $this->assertEquals( $this->sub_dir . 'baba?a=b', gp_url( 'baba', 'a=b' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_url_should_expand_query_array() {
</span><span class="cx"> $this->assertEquals( $this->sub_dir . '?a=b', gp_url( '', array('a' => 'b') ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_url_should_add_ampersand_if_path_is_empty_and_query_array_has_more_than_one_value() {
</span><span class="cx"> $this->assertEquals( $this->sub_dir . '?a=b&b=c', gp_url( '', array('a' => 'b', 'b' => 'c') ) );
</span><span class="cx"> }
</span><span class="lines">@@ -39,31 +39,31 @@
</span><span class="cx"> function test_gp_url_should_add_ampersand_if_query_array_has_more_than_one_value() {
</span><span class="cx"> $this->assertEquals( $this->sub_dir . 'baba?a=b&b=c', gp_url( 'baba', array('a' => 'b', 'b' => 'c') ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_url_should_not_add_double_slash_if_path_starts_with_slash() {
</span><span class="cx"> $this->assertEquals( $this->sub_dir . 'baba/wink', gp_url( '/baba/wink' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_url_should_urlencode_query_var_values() {
</span><span class="cx"> $this->assertEquals( $this->sub_dir . 'baba?a=a%26b&b=c', gp_url( 'baba', array('a' => 'a&b', 'b' => 'c') ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_url_join_should_return_the_string_if_single_string_without_slashes_is_passed() {
</span><span class="cx"> $this->assertEquals( 'baba', gp_url_join( 'baba' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_url_join_should_join_with_slash_two_strings_without_slashes() {
</span><span class="cx"> $this->assertEquals( 'baba/dyado', gp_url_join( 'baba', 'dyado' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_url_join_should_include_only_one_slash_if_first_string_ends_with_slash_and_next_begins_with_slash() {
</span><span class="cx"> $this->assertEquals( 'baba/dyado', gp_url_join( 'baba/', '/dyado' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_url_join_should_discard_multiple_slashes_in_the_end_of_component() {
</span><span class="cx"> $this->assertEquals( '/baba/dyado', gp_url_join( '/baba//', 'dyado' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_url_join_should_discard_multiple_slashes_in_the_beginning_of_component() {
</span><span class="cx"> $this->assertEquals( '/baba/dyado', gp_url_join( '/baba/', '//dyado' ) );
</span><span class="cx"> }
</span><span class="lines">@@ -77,23 +77,23 @@
</span><span class="cx"> $this->assertEquals( '/baba/', gp_url_join( '/', '/baba/' ) );
</span><span class="cx"> $this->assertEquals( '/baba/', gp_url_join( '//', '/baba/' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_url_join_should_return_only_one_slash_if_the_only_component_is_a_slash() {
</span><span class="cx"> $this->assertEquals( '/', gp_url_join( '/' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_url_join_should_return_only_one_slash_if_all_components_are_slashes() {
</span><span class="cx"> $this->assertEquals( '/', gp_url_join( '/', '/' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_url_join_should_return_only_one_slash_if_all_components_are_multiple_slashes() {
</span><span class="cx"> $this->assertEquals( '/', gp_url_join( '///', '///' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_url_join_should_skip_empty_components() {
</span><span class="cx"> $this->assertEquals( 'a/b', gp_url_join( 'a', '', 'b' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_url_join_should_skip_empty_components_in_the_beginning() {
</span><span class="cx"> $this->assertEquals( 'a/b', gp_url_join( '', 'a', 'b' ) );
</span><span class="cx"> }
</span><span class="lines">@@ -101,23 +101,23 @@
</span><span class="cx"> function test_gp_url_join_should_skip_empty_components_in_the_end() {
</span><span class="cx"> $this->assertEquals( 'a/b', gp_url_join( 'a', 'b', '' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_url_join_should_accept_array_component_with_one_element_and_return_this_element() {
</span><span class="cx"> $this->assertEquals( 'baba', gp_url_join( array( 'baba' ) ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_url_join_should_join_array_component_values_as_if_they_were_given_as_different_arguments() {
</span><span class="cx"> $this->assertEquals( 'baba/dyado', gp_url_join( array( 'baba', 'dyado' ) ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_url_join_should_flatten_nested_arrays() {
</span><span class="cx"> $this->assertEquals( 'baba/dyado/chicho/lelya', gp_url_join( array( 'baba', array( 'dyado', array( 'chicho' ), 'lelya' ) ) ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_url_join_should_return_empty_string_with_nested_empty_arrays() {
</span><span class="cx"> $this->assertEquals( '', gp_url_join( array( array() ), array() ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_url_join_should_not_break_http() {
</span><span class="cx"> $this->assertEquals( 'http://dir.bg/baba', gp_url_join( 'http://dir.bg/', 'baba' ) );
</span><span class="cx"> }
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> function test_gp_url_join_should_not_break_https() {
</span><span class="cx"> $this->assertEquals( 'https://dir.bg/baba', gp_url_join( 'https://dir.bg/', 'baba' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_gp_url_project_should_join_its_arguments() {
</span><span class="cx"> $url_from_gp_url_project = gp_url_project( '/x', 'import-originals' );
</span><span class="cx"> $url_manually_joined = gp_url_join( gp_url_project( '/x' ), 'import-originals' );
</span><span class="lines">@@ -135,5 +135,5 @@
</span><span class="cx"> $url_from_gp_url_project = gp_url_project( '/x', array( 'slug', 'slugslug', 'import-translations' ) );
</span><span class="cx"> $url_manually_joined = gp_url_join( gp_url_project( '/x' ), 'slug', 'slugslug', 'import-translations' );
</span><span class="cx"> $this->assertEquals( $url_manually_joined, $url_from_gp_url_project );
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkttest_userphp"></a>
<div class="modfile"><h4>Modified: trunk/t/test_user.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/test_user.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/test_user.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> require_once('init.php');
</span><span class="cx">
</span><span class="cx"> class GP_Test_User extends GP_UnitTestCase {
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_can() {
</span><span class="cx"> $user = $this->factory->user->create();
</span><span class="cx"> $set_1_permission = array( 'user_id' => $user->id, 'action' => 'write', 'object_type' => 'translation-set', 'object_id' => 1 );
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> $this->assertFalse( $user->can( 'write', 'translation-set' ) );
</span><span class="cx"> $this->assertFalse( $user->can( 'write' ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_admin_should_be_admin() {
</span><span class="cx"> $admin_user = $this->factory->user->create_admin();
</span><span class="cx"> $this->assertTrue( $admin_user->admin() );
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> $this->assertTrue( $admin_user->can( 'milk', 'a cow' ) );
</span><span class="cx"> $this->assertTrue( $admin_user->can( 'milk', 'a cow', 5 ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_non_admin_should_not_be_able_to_do_random_actions() {
</span><span class="cx"> $nonadmin_user = $this->factory->user->create();
</span><span class="cx"> $this->assertFalse( $nonadmin_user->can( 'milk', 'a cow' ) );
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> $from_db = GP::$user->by_login( 'pijo' );
</span><span class="cx"> $this->assertEquals( $user->id, $from_db->id );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_get() {
</span><span class="cx"> $user = $this->factory->user->create();
</span><span class="cx"> $from_db = GP::$user->get( $user );
</span><span class="lines">@@ -52,14 +52,14 @@
</span><span class="cx"> $user->set_meta( 'int', 5 );
</span><span class="cx"> $this->assertEquals( 5, $user->get_meta( 'int') );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_delete_meta_should_delete_the_meta() {
</span><span class="cx"> $user = $this->factory->user->create();
</span><del>- $user->set_meta( 'int', 5 );
</del><ins>+ $user->set_meta( 'int', 5 );
</ins><span class="cx"> $user->delete_meta( 'int' );
</span><span class="cx"> $this->assertEquals( null, $user->get_meta( 'int') );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_setting_array_value_as_meta_should_come_out_as_an_array() {
</span><span class="cx"> $user = $this->factory->user->create();
</span><span class="cx"> $user->set_meta( 'mixed', array(1, 2, 3) );
</span></span></pre></div>
<a id="trunkttests_routestest_route_translation_setphp"></a>
<div class="modfile"><h4>Modified: trunk/t/tests_routes/test_route_translation_set.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/tests_routes/test_route_translation_set.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/tests_routes/test_route_translation_set.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -3,51 +3,51 @@
</span><span class="cx">
</span><span class="cx"> class GP_Test_Route_Translation_Set extends GP_UnitTestCase_Route {
</span><span class="cx"> var $route_class = 'GP_Route_Translation_Set';
</span><del>-
</del><ins>+
</ins><span class="cx"> function setUp() {
</span><span class="cx"> parent::setUp();
</span><span class="cx"> $this->set = $this->factory->translation_set->create_with_project_and_locale();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_single_with_a_non_existent_set_gives_404() {
</span><span class="cx"> $this->route->single( 11 );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_single_redirects_to_existing_set() {
</span><span class="cx"> $set = $this->factory->translation_set->create_with_project_and_locale( array( 'slug' => 'baba' ) );
</span><span class="cx"> $this->route->single( $set->id );
</span><span class="cx"> $this->assertRedirectURLContains( 'baba' );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_new_get_forbidden_redirect_if_not_logged_in() {
</span><span class="cx"> $this->route->new_get();
</span><span class="cx"> $this->assertNotAllowedRedirect();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_new_get_forbidden_redirect_if_logged_in_but_without_sufficient_permissions() {
</span><span class="cx"> $this->set_normal_user_as_current();
</span><span class="cx"> $this->route->new_get();
</span><span class="cx"> $this->assertNotAllowedRedirect();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_new_get_admin_can_view_the_form() {
</span><span class="cx"> $this->set_admin_user_as_current();
</span><span class="cx"> $this->route->new_get();
</span><span class="cx"> $this->assertTemplateLoadedIs( 'translation-set-new' );
</span><span class="cx"> $this->assertTemplateOutputNotEmpty();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_new_post_forbidden_redirect_if_not_logged_in() {
</span><span class="cx"> $this->route->new_post();
</span><span class="cx"> $this->assertNotAllowedRedirect();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_new_post_forbidden_redirect_if_logged_in_but_without_sufficient_permissions() {
</span><span class="cx"> $this->set_normal_user_as_current();
</span><span class="cx"> $this->route->new_post();
</span><span class="cx"> $this->assertNotAllowedRedirect();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_new_post_invalid_redirect_if_empty_set() {
</span><span class="cx"> $this->set_admin_user_as_current();
</span><span class="cx"> $this->route->new_post();
</span><span class="lines">@@ -62,53 +62,53 @@
</span><span class="cx"> $this->route->new_post();
</span><span class="cx"> $this->assertErrorRedirect();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_new_post_should_add_notice_if_create_was_successful() {
</span><del>- $this->set_admin_user_as_current();
</del><ins>+ $this->set_admin_user_as_current();
</ins><span class="cx"> $_POST['set'] = $this->factory->translation_set->generate_args();
</span><span class="cx"> $this->route->new_post();
</span><span class="cx"> $this->assertThereIsANoticeContaining( 'created' );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_edit_get_forbidden_redirect_if_not_logged_in() {
</span><span class="cx"> $this->route->edit_get( $this->set->id );
</span><span class="cx"> $this->assertNotAllowedRedirect();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_edit_get_forbidden_redirect_if_logged_in_but_without_sufficient_permissions() {
</span><span class="cx"> $this->set_normal_user_as_current();
</span><span class="cx"> $this->route->edit_get( $this->set->id );
</span><span class="cx"> $this->assertNotAllowedRedirect();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_edit_get_admin_can_view_the_form() {
</span><span class="cx"> $this->set_admin_user_as_current();
</span><span class="cx"> $this->route->edit_get( $this->set->id );
</span><span class="cx"> $this->assertTemplateLoadedIs( 'translation-set-edit' );
</span><span class="cx"> $this->assertTemplateOutputNotEmpty();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_edit_post_with_a_non_existent_set_gives_404() {
</span><span class="cx"> $this->route->edit_post( 11 );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_edit_post_forbidden_redirect_if_not_logged_in() {
</span><span class="cx"> $this->route->edit_post( $this->set->id );
</span><span class="cx"> $this->assertNotAllowedRedirect();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_edit_post_forbidden_redirect_if_logged_in_but_without_sufficient_permissions() {
</span><span class="cx"> $this->set_normal_user_as_current();
</span><span class="cx"> $this->route->edit_post( $this->set->id );
</span><span class="cx"> $this->assertNotAllowedRedirect();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_edit_post_invalid_redirect_if_empty_set() {
</span><span class="cx"> $this->set_admin_user_as_current();
</span><span class="cx"> $this->route->edit_post( $this->set->id );
</span><span class="cx"> $this->assertInvalidRedirect();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_edit_post_invalid_redirect_if_missing_name() {
</span><span class="cx"> $this->set_admin_user_as_current();
</span><span class="cx"> $_POST['set'] = $this->factory->translation_set->generate_args();
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> $this->route->edit_post( $this->set->id );
</span><span class="cx"> $this->assertThereIsANoticeContaining( 'updated' );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_edit_post_error_redirect_if_create_was_unsuccessful() {
</span><span class="cx"> $this->set_admin_user_as_current();
</span><span class="cx"> GP::$translation_set = $this->getMock( 'GP_Translation_Set', array( 'update' ) );
</span></span></pre></div>
<a id="trunkttests_testlibtest_default_factoriesphp"></a>
<div class="modfile"><h4>Modified: trunk/t/tests_testlib/test_default_factories.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/tests_testlib/test_default_factories.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/tests_testlib/test_default_factories.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -7,13 +7,13 @@
</span><span class="cx"> $project = $project_factory->create();
</span><span class="cx"> $this->assertEquals( 'Project 1', $project->name );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_project_factory_original() {
</span><span class="cx"> $original_factory = new GP_UnitTest_Factory_For_Original;
</span><span class="cx"> $original = $original_factory->create();
</span><span class="cx"> $this->assertEquals( 'Original 1', $original->singular );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_locale_factory_create() {
</span><span class="cx"> $locale_factory = new GP_UnitTest_Factory_For_Locale;
</span><span class="cx"> $locale = $locale_factory->create();
</span></span></pre></div>
<a id="trunkttests_testlibtest_factoryphp"></a>
<div class="modfile"><h4>Modified: trunk/t/tests_testlib/test_factory.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/tests_testlib/test_factory.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/tests_testlib/test_factory.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -3,9 +3,9 @@
</span><span class="cx">
</span><span class="cx"> class GP_Thing_Test_Factory {
</span><span class="cx"> function create( $args ) {
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function save( $args ) {
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -16,10 +16,10 @@
</span><span class="cx"> $thing = (object)compact( 'field_names' );
</span><span class="cx"> $factory = new GP_UnitTest_Factory_For_Thing( null, $thing, $defaults );
</span><span class="cx"> return $factory;
</span><del>- }
-
</del><ins>+ }
+
</ins><span class="cx"> function test_generator_sequence_should_start_with_1() {
</span><del>- $sequence = new GP_UnitTest_Generator_Sequence();
</del><ins>+ $sequence = new GP_UnitTest_Generator_Sequence();
</ins><span class="cx"> $this->assertEquals( 1, $sequence->next() );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -30,24 +30,24 @@
</span><span class="cx"> $this->assertEquals( 3, $sequence->next() );
</span><span class="cx"> $this->assertEquals( 4, $sequence->next() );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_generator_sequence_should_include_value_in_template() {
</span><span class="cx"> $sequence = new GP_UnitTest_Generator_Sequence( 'Baba %s Dyado' );
</span><span class="cx"> $this->assertEquals( 'Baba 1 Dyado', $sequence->next() );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_generator_sequence_should_start_with_2() {
</span><span class="cx"> $sequence = new GP_UnitTest_Generator_Sequence( '%s', 2 );
</span><del>- $this->assertEquals( 2, $sequence->next() );
</del><ins>+ $this->assertEquals( 2, $sequence->next() );
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_generator_sequence_should_generate_consecutive_values_in_template() {
</span><span class="cx"> $sequence = new GP_UnitTest_Generator_Sequence( 'Baba %s' );
</span><span class="cx"> $this->assertEquals( 'Baba 1', $sequence->next() );
</span><span class="cx"> $this->assertEquals( 'Baba 2', $sequence->next() );
</span><span class="cx"> $this->assertEquals( 'Baba 3', $sequence->next() );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_generator_locale_name_should_start_with_aa() {
</span><span class="cx"> $locale_name = new GP_UnitTest_Generator_Locale_Name;
</span><span class="cx"> $this->assertEquals( 'aa', $locale_name->next() );
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> $factory = $this->create_factory( array('name') );
</span><span class="cx"> $this->assertEquals( array('name' => 'default'), $factory->generate_args( array(), array( 'name' => 'default' ) ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_factory_for_thing_generate_args_should_use_generator() {
</span><span class="cx"> $generator_stub = $this->getMock( 'GP_UnitTest_Generator_Sequence' );
</span><span class="cx"> $generator_stub->expects( $this->exactly( 2 ) )->method( 'next' )->will( $this->onConsecutiveCalls( 'name 1', 'name 2' ) );
</span><span class="lines">@@ -95,13 +95,13 @@
</span><span class="cx"> function test_factory_for_thing_generate_args_should_return_error_on_bad_default_value() {
</span><span class="cx"> $factory = $this->create_factory( array('name') );
</span><span class="cx"> $this->assertWPError( $factory->generate_args( array(), array( 'name' => array( 'non-scalar default value' ) ) ) );
</span><del>- }
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> function test_factory_for_thing_generate_args_should_use_default_generator_definition_if_non_given() {
</span><span class="cx"> $factory = $this->create_factory( array('name'), array('name' => 'default') );
</span><span class="cx"> $this->assertEquals( array('name' => 'default'), $factory->generate_args( array() ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_factory_for_thing_create_should_call_create_once() {
</span><span class="cx"> $factory = $this->create_factory();
</span><span class="cx"> $create_args = array( 'name' => 'value' );
</span><span class="lines">@@ -109,14 +109,14 @@
</span><span class="cx"> $factory->thing = $thing;
</span><span class="cx"> $factory->create( $create_args );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> private function create_thing_mock_with_name_field_and_with_create_which_should_be_called_once_with( $expected_create_args ) {
</span><span class="cx"> $thing = $this->getMock( 'GP_Thing_Test_Factory' );
</span><span class="cx"> $thing->field_names = array('name');
</span><span class="cx"> $thing->expects( $this->once() )->method( 'create' )->with( $this->equalTo( $expected_create_args ) );
</span><span class="cx"> return $thing;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_factory_for_thing_create_should_use_function_generator() {
</span><span class="cx"> $generation_defintions = array(
</span><span class="cx"> 'full_name' => GP_UnitTest_Factory_For_Thing::callback( create_function( '$o', 'return $o->name . " baba";' ) ),
</span><span class="lines">@@ -139,5 +139,5 @@
</span><span class="cx"> $created_thing->expects( $this->once() )->method( 'save' )->with( $this->equalTo( $expected_save_args ) );
</span><span class="cx"> $thing->expects( $this->once() )->method( 'create' )->will( $this->returnValue( $created_thing ) );
</span><span class="cx"> return $thing;
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkttests_thingstest_thing_originalphp"></a>
<div class="modfile"><h4>Modified: trunk/t/tests_things/test_thing_original.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/tests_things/test_thing_original.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/tests_things/test_thing_original.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -9,11 +9,11 @@
</span><span class="cx"> function update( $data, $where = null ) {
</span><span class="cx"> $GLOBALS['update_invocation_count']++;
</span><span class="cx"> return parent::update( $data, $where );
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class GP_Test_Thing_Original extends GP_UnitTestCase {
</span><del>-
</del><ins>+
</ins><span class="cx"> function create_original_with_update_counter( $original_args = array() ) {
</span><span class="cx"> $project = $this->factory->project->create();
</span><span class="cx"> /* We are doing it this hackish way, because I could not make the PHPUnit mocker to count the update() invocations */
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> $original->reload();
</span><span class="cx"> return array( $project, $original );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function create_translations_with( $entries ) {
</span><span class="cx"> $translations = new Translations;
</span><span class="cx"> foreach( $entries as $entry ) {
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> $original->import_for_project( $project, $translations );
</span><span class="cx"> $this->assertEquals( 0, $GLOBALS['update_invocation_count'], 'update should be invoked only 2 times' );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_import_for_project_should_update_changed_originals() {
</span><span class="cx"> list( $project, $original ) = $this->create_original_with_update_counter( array(
</span><span class="cx"> 'comment' => 'Some comment'
</span><span class="lines">@@ -47,24 +47,24 @@
</span><span class="cx"> $translations = $this->create_translations_with( array( array( 'singular' => $original->singular ) ) );
</span><span class="cx"> $original->import_for_project( $project, $translations );
</span><span class="cx"> $this->assertEquals( 1, $GLOBALS['update_invocation_count'], 'update should be invoked 3 times' );
</span><del>- }
-
</del><ins>+ }
+
</ins><span class="cx"> function test_should_be_updated_with_should_return_true_if_only_singular_is_for_update_and_it_is_the_same() {
</span><span class="cx"> $original = $this->factory->original->create();
</span><span class="cx"> $this->assertFalse( GP::$original->should_be_updated_with( array( 'singular' => $original->singular ), $original ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_should_be_updated_with_should_return_true_if_one_value_is_empty_string_and_the_other_is_null() {
</span><span class="cx"> $original = $this->factory->original->create( array( 'comment' => NULL ) );
</span><span class="cx"> $this->assertFalse( GP::$original->should_be_updated_with( array( 'singular' => $original->singular, 'comment' => '' ), $original ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_should_be_updated_with_should_use_this_if_second_argument_is_not_supplied() {
</span><span class="cx"> $original = $this->factory->original->create();
</span><span class="cx"> $data = array( 'singular' => 'baba' );
</span><span class="cx"> $this->assertEquals( GP::$original->should_be_updated_with( $data, $original ), $original->should_be_updated_with( $data ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_import_should_leave_unchanged_strings_as_active() {
</span><span class="cx"> $project = $this->factory->project->create();
</span><span class="cx"> $original = $this->factory->original->create( array( 'project_id' => $project->id, 'status' => '+active', 'singular' => 'baba' ) );
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> $this->assertEquals( 1, count( $originals_for_project ) );
</span><span class="cx"> $this->assertEquals( 'baba', $originals_for_project[0]->singular );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_import_should_remove_from_active_missing_strings() {
</span><span class="cx"> $project = $this->factory->project->create();
</span><span class="cx"> $original = $this->factory->original->create( array( 'project_id' => $project->id, 'status' => '+active' ) );
</span><span class="lines">@@ -82,5 +82,5 @@
</span><span class="cx"> $original->import_for_project( $project, new Translations );
</span><span class="cx"> $originals_for_project = $original->by_project_id( $project->id );
</span><span class="cx"> $this->assertEquals( 0, count( $originals_for_project ) );
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkttests_thingstest_thing_projectphp"></a>
<div class="modfile"><h4>Modified: trunk/t/tests_things/test_thing_project.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/tests_things/test_thing_project.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/tests_things/test_thing_project.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> $this->assertEquals( 'root/cool/p2', $p2->path);
</span><span class="cx"> $this->assertEquals( 'root/cool/p2/p3', $p3->path);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_valid_path_on_create() {
</span><span class="cx"> $root = GP::$project->create( array( 'name' => 'Root', 'slug' => 'root', 'path' => 'root' ) );
</span><span class="cx"> $p1 = GP::$project->create( array( 'name' => 'P1', 'slug' => 'p1', 'parent_project_id' => $root->id ) );
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> $this->assertEquals( 'root/p1', $p1->path );
</span><span class="cx"> $this->assertEquals( 'invader', $q->path );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_save_no_args() {
</span><span class="cx"> $p1 = GP::$project->create( array( 'name' => 'P1', 'slug' => 'p1', 'path' => 'p1', ) );
</span><span class="cx"> $id = $p1->id;
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> $this->assertEquals( 'P2', $p1->name );
</span><span class="cx"> $this->assertEquals( 'P2', GP::$project->get( $id )->name );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_reload() {
</span><span class="cx"> global $gpdb;
</span><span class="cx"> $root = GP::$project->create( array( 'name' => 'Root', 'slug' => 'root' ) );
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> $root->reload();
</span><span class="cx"> $this->assertEquals( 'Buuu', $root->name );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_path_to_root() {
</span><span class="cx"> $root = $this->factory->project->create( array( 'name' => 'Root' ) );
</span><span class="cx"> $sub = $this->factory->project->create( array( 'name' => 'Sub', 'parent_project_id' => $root->id ) );
</span></span></pre></div>
<a id="trunkttests_thingstest_thing_translationphp"></a>
<div class="modfile"><h4>Modified: trunk/t/tests_things/test_thing_translation.php (717 => 718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/tests_things/test_thing_translation.php 2012-10-31 00:23:28 UTC (rev 717)
+++ trunk/t/tests_things/test_thing_translation.php 2012-10-31 00:32:02 UTC (rev 718)
</span><span class="lines">@@ -7,14 +7,14 @@
</span><span class="cx"> $translation = $this->factory->translation->create( $plurals );
</span><span class="cx"> $this->assertEqualFields( $translation, $plurals );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_translation_should_write_all_6_plurals_to_database() {
</span><span class="cx"> $plurals = array( 'translation_0' => 'Zero', 'translation_1' => 'One', 'translation_2' => 'Two', 'translation_3' => 'Three', 'translation_4' => 'Four', 'translation_5' => 'Five' );
</span><span class="cx"> $translation = $this->factory->translation->create( $plurals );
</span><span class="cx"> $translation->reload();
</span><span class="cx"> $this->assertEqualFields( $translation, $plurals );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_for_translation_shouldnt_exclude_originals_with_rejected_translation_if_status_has_untranslated() {
</span><span class="cx"> $set = $this->factory->translation_set->create_with_project_and_locale();
</span><span class="cx"> $translation = $this->factory->translation->create_with_original_for_translation_set( $set );
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> $this->assertEquals( 1, count( $for_translation ) );
</span><span class="cx"> $this->assertEquals( null, $for_translation[0]->id );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_for_translation_should_include_untranslated_by_default() {
</span><span class="cx"> $set = $this->factory->translation_set->create_with_project_and_locale();
</span><span class="cx"> $original1 = $this->factory->original->create( array( 'project_id' => $set->project_id ) );
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> $this->assertEquals( null, $for_translation[0]->id );
</span><span class="cx"> $this->assertEquals( $translation1->id, $for_translation[1]->id );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_for_translation_should_not_include_old_by_default() {
</span><span class="cx"> $set = $this->factory->translation_set->create_with_project_and_locale();
</span><span class="cx"> $original1 = $this->factory->original->create( array( 'project_id' => $set->project_id ) );
</span><span class="lines">@@ -47,8 +47,8 @@
</span><span class="cx"> $this->assertEquals( null, $for_translation[0]->id );
</span><span class="cx"> $this->assertEquals( $translation1_current->id, $for_translation[1]->id );
</span><span class="cx"> }
</span><del>-
-
</del><ins>+
+
</ins><span class="cx"> function test_for_translation_should_not_include_untranslated_for_single_status() {
</span><span class="cx"> $set = $this->factory->translation_set->create_with_project_and_locale();
</span><span class="cx"> $original1 = $this->factory->original->create( array( 'project_id' => $set->project_id ) );
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> $this->assertEquals( 1, count( $for_translation ) );
</span><span class="cx"> $this->assertEquals( $translation1->id, $for_translation[0]->id );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_for_export_should_include_untranslated() {
</span><span class="cx"> $set = $this->factory->translation_set->create_with_project_and_locale();
</span><span class="cx"> $original1 = $this->factory->original->create( array( 'project_id' => $set->project_id ) );
</span><span class="lines">@@ -67,6 +67,6 @@
</span><span class="cx"> $for_export = GP::$translation->for_export( $set->project, $set, 0, array('status' => 'current'), array('by' => 'translation', 'how' => 'asc') );
</span><span class="cx"> $this->assertEquals( 2, count( $for_export ) );
</span><span class="cx"> $this->assertEquals( $translation1->id, $for_export[0]->id );
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>