Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 0d9ac875

Von Moritz Bunkus vor mehr als 19 Jahren hinzugefügt

  • ID 0d9ac875bf41d614388e6cf3864806de4c04c0e9
  • Vorgänger 416a2b89
  • Nachfolger 5d0421a3

Probleme durch perltidy. Der sehr pingelige Parser von locales.pl akzeptiert Begriffe fuer Funktionen, die in einem Formular mit <input type=submit...> genannt werden, nur dann, wenn das $locale->text() in der gleichen Zeile wie type=submit steht. Dieses habe ich geaendert. Weitere Probleme gab es, wenn perltidy bei sehr langen Strings zu $locale->text() den sehr langen Text in eine eigene Zeile gepackt hat, weil auch hier locales.pl den zu uebersetzenden Text direkt hinter $locale->text( erwartet.

Unterschiede anzeigen:

bin/mozilla/admin.pl
344 344
| . $locale->text('Click on login name to edit!') . qq|
345 345
<br>
346 346
|
347
    . $locale->text(
348
    'To add a user to a group edit a name, change the login name and save.  A new user with the same variables will then be saved under the new login name.'
349
    )
347
    . $locale->text('To add a user to a group edit a name, change the login name and save.  A new user with the same variables will then be saved under the new login name.')
350 348
    . qq|
351 349

  
352 350
<p>
......
1195 1193
  &dbdriver_defaults;
1196 1194

  
1197 1195
  $msg{Pg} =
1198
    $locale->text(
1199
    'Leave host and port field empty unless you want to make a remote connection.'
1200
    );
1196
    $locale->text('Leave host and port field empty unless you want to make a remote connection.');
1201 1197
  $msg{Oracle} =
1202
    $locale->text(
1203
           'You must enter a host and port for local and remote connections!');
1198
    $locale->text('You must enter a host and port for local and remote connections!');
1204 1199

  
1205 1200
  $form->{title} =
1206 1201
    "Lx-Office ERP / " . $locale->text('Database Administration');
......
1280 1275
</table>
1281 1276

  
1282 1277
<p>|
1283
    . $locale->text(
1284
    'This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!'
1285
    )
1278
    . $locale->text('This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!')
1286 1279

  
1287 1280
    . qq|
1288 1281
<br>$msg{$form->{dbdriver}}
bin/mozilla/am.pl
1759 1759
	      </tr>
1760 1760
	      <tr>
1761 1761
		<td colspan=2>|
1762
    . $locale->text(
1763
    'Enter up to 3 letters separated by a colon (i.e CAD:USD:EUR) for your native and foreign currencies'
1764
    )
1762
    . $locale->text('Enter up to 3 letters separated by a colon (i.e CAD:USD:EUR) for your native and foreign currencies')
1765 1763
    . qq|<br><input name=curr size=40 value="$form->{defaults}{curr}"></td>
1766 1764
	      </tr>
1767 1765
            </table>
bin/mozilla/bp.pl
281 281
<h2 class=confirm>$form->{title}</h2>
282 282

  
283 283
<h4>|
284
    . $locale->text(
285
          'Are you sure you want to remove the marked entries from the queue?')
284
    . $locale->text('Are you sure you want to remove the marked entries from the queue?')
286 285
    . qq|</h4>
287 286

  
288 287
<input name=action class=submit type=submit value="|
bin/mozilla/licenses.pl
291 291
  $lxdebug->enter_sub();
292 292
  if (!$lizenzen) {
293 293
    $form->error(
294
                 $locale->text(
295
                   'The licensing module has been deactivated in lx-erp.conf.')
294
                 $locale->text('The licensing module has been deactivated in lx-erp.conf.')
296 295
    );
297 296
  }
298 297

  
......
543 542
        |);
544 543
  if (scalar(@{ $form->{"licenses"} }) == 0) {
545 544
    print(qq|</table>|
546
            . $locale->text(
547
                      "No licenses were found that match the search criteria.")
545
            . $locale->text("No licenses were found that match the search criteria.")
548 546
            . qq|</body></html>|);
549 547
    exit(0);
550 548
  }
bin/mozilla/ustva.pl
236 236
  $checked = "checked" if ($form->{kz10} eq '1');
237 237
  print qq|
238 238
           <input name="FA_10" id=FA_10 class=checkbox type=checkbox value="1" $checked title = "|
239
    . $locale->text(
240
      'Ist dies eine berichtigte Anmeldung? (Nr. 10/Zeile 15 Steuererkl?rung)')
239
    . $locale->text('Ist dies eine berichtigte Anmeldung? (Nr. 10/Zeile 15 Steuererkl?rung)')
241 240
    . qq|">
242 241
            | . $locale->text('Berichtigte Anmeldung') . qq|
243 242
          <br>
......
1228 1227

  
1229 1228
  # Auf ?bergabefehler checken
1230 1229
  USTVA::info(
1231
    $locale->text(
1232
      'Bitte das Bundesland UND die Stadt bzw. den Einzugsbereich Ihres zust?ndigen Finanzamts ausw?hlen.'
1233
    ))
1230
    $locale->text('Bitte das Bundesland UND die Stadt bzw. den Einzugsbereich Ihres zust?ndigen Finanzamts ausw?hlen.'))
1234 1231
    if (   $form->{elsterFFFF_new} eq 'Auswahl'
1235 1232
        || $form->{elsterland_new} eq 'Auswahl');
1236 1233
  USTVA::info(
locale/de/locales.pl
218 218
  my $fh = new FileHandle;
219 219
  open $fh, "$file" or die "$! : $file";
220 220

  
221
  my ($is_submit, $line_no, $sub_line_no) = (0, 0, 0);
222
	
221 223
  while (<$fh>) {
224
    $line_no++;
222 225
    # is this another file
223 226
    if (/require\s+\W.*\.pl/) {
224 227
      my $newfile = $&;
......
240 243
      if (/Locale/) {
241 244
	unless (/^use /) {
242 245
	  my ($null, $country) = split /,/;
243
	  $country =~ s/^ +["']//;
244
	  $country =~ s/["'].*//;
246
	  $country =~ s/^ +[\"\']//;
247
	  $country =~ s/[\"\'].*//;
245 248
	}
246 249
      }
247 250

  
248
      if (/\$locale->text.*?\W\)/) {
251
      my $postmatch = "";
252
      # is it a submit button before $locale->
253
      if (/type\s*=\s*submit/i) {
254
        $postmatch = $';
255
        if ($` !~ /\$locale->text/) {
256
          $is_submit = 1;
257
          $sub_line_no = $line_no;
258
        }
259
      }
260

  
261
      my ($found) = /\$locale->text.*?\W\)/;
262
      my $postmatch = $';
263

  
264
      if ($found) {
249 265
	my $string = $&;
250
	$string =~ s/\$locale->text\(\s*['"(q|qq)]['\/\\\|~]*//;
266
	$string =~ s/\$locale->text\(\s*[\'\"(q|qq)][\'\/\\\|~]*//;
251 267
	$string =~ s/\W\)+.*$//;
252 268

  
253 269
        # if there is no $ in the string record it
......
259 275
	  $alllocales{$string} = 1;
260 276

  
261 277
          # is it a submit button before $locale->
262
          if (/type=submit/) {
278
          if ($is_submit) {
263 279
	    $submit{$string} = 1;
264 280
          }
265 281
	}
282
      } elsif ($postmatch =~ />/) {
283
        $is_submit = 0;
266 284
      }
267 285

  
268 286
      # exit loop if there are no more locales on this line
269
      ($rc) = ($' =~ /\$locale->text/);
287
      ($rc) = ($postmatch =~ /\$locale->text/);
270 288
      # strip text
271 289
      s/^.*?\$locale->text.*?\)//;
290

  
291
      if (($postmatch =~ />/) ||
292
          (!$found && ($sub_line_no != $line_no) && />/)) {
293
        $is_submit = 0;
294
      }
272 295
    }
273 296
  }
274 297

  
locale/de/rp
170 170
  'alle_ausw?hlen'              => 'select_all',
171 171
  'konfiguration'               => 'config',
172 172
  'debug'                       => 'debug',
173
  'winston_export'              => 'winston_export',
173 174
};
174 175

  
175 176
1;

Auch abrufbar als: Unified diff