[Rt-commit] r17327 - in rt/3.8/branches/cfcleanups: lib/RT lib/RT/I18N t/api

[falcone at bestpractical.com]

Author: falcone
Date: Wed Dec 24 11:49:57 2008
New Revision: 17327

Added:
   rt/3.8/branches/cfcleanups/lib/RT/I18N/ru.pm   (contents, props changed)
Modified:
   rt/3.8/branches/cfcleanups/   (props changed)
   rt/3.8/branches/cfcleanups/lib/RT/I18N/ru.po
   rt/3.8/branches/cfcleanups/lib/RT/Test.pm
   rt/3.8/branches/cfcleanups/t/api/date.t
   rt/3.8/branches/cfcleanups/t/api/user.t

Log:
- Merge //mirror/bps-public/rt/3.8/trunk to //mirror/bps-public/rt/3.8/branches/cfcleanups

Added: rt/3.8/branches/cfcleanups/lib/RT/I18N/ru.pm
==============================================================================
--- (empty file)
+++ rt/3.8/branches/cfcleanups/lib/RT/I18N/ru.pm	Wed Dec 24 11:49:57 2008
@@ -0,0 +1,74 @@
+# BEGIN BPS TAGGED BLOCK {{{
+# 
+# COPYRIGHT:
+# 
+# This software is Copyright (c) 1996-2008 Best Practical Solutions, LLC
+#                                          <jesse at bestpractical.com>
+# 
+# (Except where explicitly superseded by other copyright notices)
+# 
+# 
+# LICENSE:
+# 
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 or visit their web page on the internet at
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
+# 
+# 
+# CONTRIBUTION SUBMISSION POLICY:
+# 
+# (The following paragraph is not intended to limit the rights granted
+# to you to modify and distribute this software under the terms of
+# the GNU General Public License and is only of importance to you if
+# you choose to contribute your changes and enhancements to the
+# community by submitting them to Best Practical Solutions, LLC.)
+# 
+# By intentionally submitting any modifications, corrections or
+# derivatives to this work, or any other work intended for use with
+# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+# you are the copyright holder for those contributions and you grant
+# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+# royalty-free, perpetual, license to use, copy, create derivative
+# works based on those contributions, and sublicense and distribute
+# those contributions and any derivatives thereof.
+# 
+# END BPS TAGGED BLOCK }}}
+
+package RT::I18N::ru;
+
+sub quant {
+    my($handle, $num, @forms) = @_;
+
+    return $num unless @forms;
+    return $forms[3] if !$num && $forms[3];
+
+    return $num .' '. $handle->numerate($num, @forms);
+}
+
+sub numerate {
+    my($handle, $n, @forms) = @_;
+
+    my $form = 0;
+    if ( $n%10 == 1 && $n%100 != 11 ) {
+        $form = 0;
+    } elsif ( $n%10 <=4 && ($n%100 < 10 || $n%100 >= 20) ) {
+        $form = 1;
+    } else {
+        $form = 2;
+    }
+    return $forms[$form];
+}
+
+1;

Modified: rt/3.8/branches/cfcleanups/lib/RT/I18N/ru.po
==============================================================================
--- rt/3.8/branches/cfcleanups/lib/RT/I18N/ru.po	(original)
+++ rt/3.8/branches/cfcleanups/lib/RT/I18N/ru.po	Wed Dec 24 11:49:57 2008
@@ -433,7 +433,7 @@
 #: share/html/Ticket/Elements/ShowTime:51
 #. (sprintf("%.1f",$minutes / 60))
 msgid "%quant(%1,hour)"
-msgstr ""
+msgstr "%quant(%1,час,часа,часов)"
 
 #: lib/RT/Ticket_Overlay.pm:878
 #. ($args{'Status'})

Modified: rt/3.8/branches/cfcleanups/lib/RT/Test.pm
==============================================================================
--- rt/3.8/branches/cfcleanups/lib/RT/Test.pm	(original)
+++ rt/3.8/branches/cfcleanups/lib/RT/Test.pm	Wed Dec 24 11:49:57 2008
@@ -55,6 +55,9 @@
 use Socket;
 use File::Temp;
 use File::Spec;
+
+our @EXPORT = qw(is_empty);
+
 my $config;
 our ($existing_server, $port, $dbname);
 my $mailsent;
@@ -184,6 +187,16 @@
     mkpath [ $RT::MasonSessionDir ]
         if RT->Config->Get('DatabaseType');
 
+    __PACKAGE__->export_to_level(1, @EXPORT);
+
+}
+
+sub is_empty($;$) {
+    my ($v, $d) = shift;
+    local $Test::Builder::Level = $Test::Builder::Level + 1;
+    return Test::More::ok(1, $d) unless defined $v;
+    return Test::More::ok(1, $d) unless length $v;
+    return Test::More::is($v, '', $d);
 }
 
 my $created_new_db;    # have we created new db? mainly for parallel testing

Modified: rt/3.8/branches/cfcleanups/t/api/date.t
==============================================================================
--- rt/3.8/branches/cfcleanups/t/api/date.t	(original)
+++ rt/3.8/branches/cfcleanups/t/api/date.t	Wed Dec 24 11:49:57 2008
@@ -63,8 +63,7 @@
     is($date->Timezone, 'UTC', "the deafult value is always UTC");
     
     $current_user->UserObj->__Set( Field => 'Timezone', Value => '');
-    is($current_user->UserObj->Timezone,
-       '',
+    is_empty($current_user->UserObj->Timezone,
        "successfuly changed user's timezone");
     is($date->Timezone('user'),
        'Africa/Ouagadougou',

Modified: rt/3.8/branches/cfcleanups/t/api/user.t
==============================================================================
--- rt/3.8/branches/cfcleanups/t/api/user.t	(original)
+++ rt/3.8/branches/cfcleanups/t/api/user.t	Wed Dec 24 11:49:57 2008
@@ -59,7 +59,7 @@
 # can we change the address back to "";  
 ($id,$msg) = $u7->SetEmailAddress('');
 ok ($id, $msg);
-is ($u7->EmailAddress, '');
+is_empty ($u7->EmailAddress);