Page Index Toggle Pages: 1 ReplyAdd Poll Send Topic
Normal Topic branches/2.6 language cleanup (Read 3076 times)
 
Paste Member Name in Quick Reply Box Monni
Language
***
Offline


Min izāmō

Posts: 413
Location: Kaarina, Finland
Joined: Jul 16th, 2014
Gender: Male
Mood: Frustrated
Zodiac sign: Pisces
Re: branches/2.6 language cleanup
Reply #2 - Aug 16th, 2014 at 8:41pm
Mark & QuoteQuote  
Dandello wrote on Aug 16th, 2014 at 8:22pm:
Smiley I thought I had the branch and trunk pretty well matched up - obviously this one slipped past.

I'm just lazy and use WinMerge to match and compare things. Integrates well with TortoiseSVN.
  
Back to top
IP Logged
 
Paste Member Name in Quick Reply Box Dandello
Forum Administrator
YaBB Modder
*****
Offline


I love YaBB 2.7!

Posts: 2276
Location: The Land of YaBB
Joined: Feb 12th, 2014
Gender: Female
Mood: Annoyed
Zodiac sign: Virgo
Re: branches/2.6 language cleanup
Reply #1 - Aug 16th, 2014 at 8:22pm
Mark & QuoteQuote  
Smiley I thought I had the branch and trunk pretty well matched up - obviously this one slipped past.
  

Perfection is not possible. Excellence, however, is excellent.
Back to top
WWW  
IP Logged
 
Paste Member Name in Quick Reply Box Monni
Language
***
Offline


Min izāmō

Posts: 413
Location: Kaarina, Finland
Joined: Jul 16th, 2014
Gender: Male
Mood: Frustrated
Zodiac sign: Pisces
branches/2.6 language cleanup
Aug 16th, 2014 at 6:01pm
Mark & QuoteQuote  
Code
Select All
 Index: cgi-bin/yabb2/Admin/NewSettings.pm
 ===================================================================
 --- cgi-bin/yabb2/Admin/NewSettings.pm	(revision 1534)
 +++ cgi-bin/yabb2/Admin/NewSettings.pm	(working copy)
 @@ -721,7 +721,7 @@
  \$fix_brd_img_size = $fix_brd_img_size;
  \$img_greybox = $img_greybox;           # Set to 0 to disable "greybox" (each image is shown in a new window)
                              # Set to 1 to enable the attachment and post image "greybox" (one image/page)
 -                            # Set to 2 to enable the attachment and post image "greybox" => attachmet images: (all images/page), post images: (one image/page)
 +                            # Set to 2 to enable the attachment and post image "greybox" => attachment images: (all images/page), post images: (one image/page)

  ########## Extended Profiles ##########

 Index: cgi-bin/yabb2/Admin/Settings_ExtendedProfiles.pm
 ===================================================================
 --- cgi-bin/yabb2/Admin/Settings_ExtendedProfiles.pm	(revision 1534)
 +++ cgi-bin/yabb2/Admin/Settings_ExtendedProfiles.pm	(working copy)
 @@ -215,18 +215,18 @@
              $newmonth--;
              $newmonth2 = $months[$newmonth];
              if ( $newday > 10 && $newday < 20 ) {
 -                $newday2 = "<sup>$timetxt{'4'}</sup>";
 +                $newday2 = "$timetxt{'4'}";
              }
              elsif ( $newday % 10 == 1 ) {
 -                $newday2 = "<sup>$timetxt{'1'}</sup>";
 +                $newday2 = "$timetxt{'1'}";
              }
              elsif ( $newday % 10 == 2 ) {
 -                $newday2 = "<sup>$timetxt{'2'}</sup>";
 +                $newday2 = "$timetxt{'2'}";
              }
              elsif ( $newday % 10 == 3 ) {
 -                $newday2 = "<sup>$timetxt{'3'}</sup>";
 +                $newday2 = "$timetxt{'3'}";
              }
 -            else { $newday2 = "<sup>$timetxt{'4'}</sup>"; }
 +            else { $newday2 = "$timetxt{'4'}"; }
              $newformat = qq~$newmonth2 $newday$newday2, $newyear~;
              return $newformat;

 @@ -262,18 +262,18 @@

              if ( $mytimeformat =~ m/\+/sm ) {
                  if ( $newday > 10 && $newday < 20 ) {
 -                    $dayext = "<sup>$timetxt{'4'}</sup>";
 +                    $dayext = "$timetxt{'4'}";
                  }
                  elsif ( $newday % 10 == 1 ) {
 -                    $dayext = "<sup>$timetxt{'1'}</sup>";
 +                    $dayext = "$timetxt{'1'}";
                  }
                  elsif ( $newday % 10 == 2 ) {
 -                    $dayext = "<sup>$timetxt{'2'}</sup>";
 +                    $dayext = "$timetxt{'2'}";
                  }
                  elsif ( $newday % 10 == 3 ) {
 -                    $dayext = "<sup>$timetxt{'3'}</sup>";
 +                    $dayext = "$timetxt{'3'}";
                  }
 -                else { $dayext = "<sup>$timetxt{'4'}</sup>"; }
 +                else { $dayext = "$timetxt{'4'}"; }
              }
              $mytimeformat =~ s/YYYY/$newyear/gxsm;
              $mytimeformat =~ s/YY/$newshortyear/gxsm;
 Index: cgi-bin/yabb2/Languages/English/Admin.lng
 ===================================================================
 --- cgi-bin/yabb2/Languages/English/Admin.lng	(revision 1534)
 +++ cgi-bin/yabb2/Languages/English/Admin.lng	(working copy)
 @@ -1149,10 +1149,10 @@
  $maintxt {'dst'} = '<sup>*</sup>'; ## needed to show Today in registration log

  %timetxt = (
 -'1' => 'st',
 -'2' => 'nd',
 -'3' => 'rd',
 -'4' => 'th',
 +'1' => '<sup>st</sup>',
 +'2' => '<sup>nd</sup>',
 +'3' => '<sup>rd</sup>',
 +'4' => '<sup>th</sup>',
  );

  %settop_txt = (
  

  
Back to top
IP Logged
 
Page Index Toggle Pages: 1
ReplyAdd Poll Send Topic
Bookmarks: del.icio.us Digg Facebook Google LinkedIn reddit Twitter Yahoo
branches/2.6 language cleanup

Please type the characters exactly as they appear in the image,
without the first 2 and last 2 characters.
The characters must be typed in the same order,
and they are case-sensitive.
Open Preview Preview

You can resize the textbox by dragging the right or bottom border.
Off Topic Comment Insert Spoiler
Insert Hyperlink Insert FTP Link Insert Image Insert E-mail Insert Media Insert Table Insert Table Row Insert Table Column Insert Horizontal Rule Insert Teletype Insert Code Insert Quote Edited Superscript Subscript Insert List /me - my name Insert Marquee Insert Timestamp No Parse
Bold Italicized Underline Insert Strikethrough Highlight
                       
Change Text Color
Insert Preformatted Text Left Align Centered Right Align
resize_wb
resize_hb







Max 5000 characters. Remaining characters:
Text size: %
More Smilies
View All Smilies
Collapse additional features Collapse/Expand additional features Smiley Wink Cheesy Grin Angry Sad Shocked Cool Huh Roll Eyes Tongue Embarrassed Lips Sealed Undecided Kiss Cry