Merged in feature/81-dev-dev01 (pull request #5)

auto-patch  81-dev-dev01-2023-12-05T22_45_26

* auto-patch  81-dev-dev01-2023-12-05T22_45_26
This commit is contained in:
Tony Volpe
2023-12-05 23:05:59 +00:00
parent ba16964e7a
commit 725d3043d5
1463 changed files with 142461 additions and 89421 deletions

View File

@@ -111,7 +111,6 @@ if ( ! class_exists( 'Translation_Entry', false ) ) :
if ( $this->extracted_comments !== $other->extracted_comments ) {
$this->extracted_comments .= $other->extracted_comments;
}
}
}
endif;

View File

@@ -129,7 +129,7 @@ if ( ! class_exists( 'MO', false ) ) :
// Headers' msgid is an empty string.
fwrite( $fh, pack( 'VV', 0, $current_addr ) );
$current_addr++;
++$current_addr;
$originals_table = "\0";
$reader = new POMO_Reader();

View File

@@ -110,19 +110,19 @@ if ( ! class_exists( 'Plural_Forms', false ) ) :
// Ignore whitespace.
case ' ':
case "\t":
$pos++;
++$pos;
break;
// Variable (n).
case 'n':
$output[] = array( 'var' );
$pos++;
++$pos;
break;
// Parentheses.
case '(':
$stack[] = $next;
$pos++;
++$pos;
break;
case ')':
@@ -144,7 +144,7 @@ if ( ! class_exists( 'Plural_Forms', false ) ) :
throw new Exception( 'Mismatched parentheses' );
}
$pos++;
++$pos;
break;
// Operators.
@@ -189,7 +189,7 @@ if ( ! class_exists( 'Plural_Forms', false ) ) :
$o2 = $stack[ $s_pos ];
if ( '?' !== $o2 ) {
$output[] = array( 'op', array_pop( $stack ) );
$s_pos--;
--$s_pos;
continue;
}
@@ -202,7 +202,7 @@ if ( ! class_exists( 'Plural_Forms', false ) ) :
if ( ! $found ) {
throw new Exception( 'Missing starting "?" ternary operator' );
}
$pos++;
++$pos;
break;
// Default - number or invalid.
@@ -264,7 +264,7 @@ if ( ! class_exists( 'Plural_Forms', false ) ) :
$total = count( $this->tokens );
while ( $i < $total ) {
$next = $this->tokens[ $i ];
$i++;
++$i;
if ( 'var' === $next[0] ) {
$stack[] = $n;
continue;

View File

@@ -342,7 +342,7 @@ if ( ! class_exists( 'PO', false ) ) :
$context = '';
$msgstr_index = 0;
while ( true ) {
$lineno++;
++$lineno;
$line = PO::read_line( $f );
if ( ! $line ) {
if ( feof( $f ) ) {
@@ -365,7 +365,7 @@ if ( ! class_exists( 'PO', false ) ) :
// The comment is the start of a new entry.
if ( self::is_final( $context ) ) {
PO::read_line( $f, 'put-back' );
$lineno--;
--$lineno;
break;
}
// Comments have to be at the beginning.
@@ -377,7 +377,7 @@ if ( ! class_exists( 'PO', false ) ) :
} elseif ( preg_match( '/^msgctxt\s+(".*")/', $line, $m ) ) {
if ( self::is_final( $context ) ) {
PO::read_line( $f, 'put-back' );
$lineno--;
--$lineno;
break;
}
if ( $context && 'comment' !== $context ) {
@@ -388,7 +388,7 @@ if ( ! class_exists( 'PO', false ) ) :
} elseif ( preg_match( '/^msgid\s+(".*")/', $line, $m ) ) {
if ( self::is_final( $context ) ) {
PO::read_line( $f, 'put-back' );
$lineno--;
--$lineno;
break;
}
if ( $context && 'msgctxt' !== $context && 'comment' !== $context ) {

View File

@@ -299,7 +299,6 @@ if ( ! class_exists( 'POMO_StringReader', false ) ) :
public function read_all() {
return $this->substr( $this->_str, $this->_pos, $this->strlen( $this->_str ) );
}
}
endif;
@@ -359,4 +358,3 @@ if ( ! class_exists( 'POMO_CachedIntFileReader', false ) ) :
}
}
endif;

View File

@@ -261,7 +261,7 @@ if ( ! class_exists( 'Translations', false ) ) :
switch ( $char ) {
case '?':
$res .= ' ? (';
$depth++;
++$depth;
break;
case ':':
$res .= ') : (';