Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 00f9b4aa

Von Wulf vor fast 13 Jahren hinzugefügt

  • ID 00f9b4aace493f778a1470a00bd750d6ce298cd5
  • Vorgänger e0c425bf
  • Nachfolger 648c7812

Fix Bug 1735
Dateinamen werden mit de, en, oder fr uebersetzt, wenn eine entsprechung zur ausgewaehlten Kundensprache existiert.
Default/Fallback = de

Unterschiede anzeigen:

SL/Form.pm
56 56
use SL::DO;
57 57
use SL::IC;
58 58
use SL::IS;
59
use SL::Locale;
59 60
use SL::Mailer;
60 61
use SL::Menu;
61 62
use SL::MoreCommon qw(uri_encode uri_decode);
......
1241 1242

  
1242 1243
  $formname ||= $self->{formname};
1243 1244

  
1245
  $self->{recipient_locale} ||=  Locale->lang_to_locale($self->{language});
1246
  my $recipient_locale = Locale->new($self->{recipient_locale});
1247

  
1244 1248
  my %formname_translations = (
1245
    bin_list                => $main::locale->text('Bin List'),
1246
    credit_note             => $main::locale->text('Credit Note'),
1247
    invoice                 => $main::locale->text('Invoice'),
1248
    pick_list               => $main::locale->text('Pick List'),
1249
    proforma                => $main::locale->text('Proforma Invoice'),
1250
    purchase_order          => $main::locale->text('Purchase Order'),
1251
    request_quotation       => $main::locale->text('RFQ'),
1252
    sales_order             => $main::locale->text('Confirmation'),
1253
    sales_quotation         => $main::locale->text('Quotation'),
1254
    storno_invoice          => $main::locale->text('Storno Invoice'),
1255
    sales_delivery_order    => $main::locale->text('Delivery Order'),
1256
    purchase_delivery_order => $main::locale->text('Delivery Order'),
1257
    dunning                 => $main::locale->text('Dunning'),
1249
    bin_list                => $recipient_locale->text('Bin List'),
1250
    credit_note             => $recipient_locale->text('Credit Note'),
1251
    invoice                 => $recipient_locale->text('Invoice'),
1252
    pick_list               => $recipient_locale->text('Pick List'),
1253
    proforma                => $recipient_locale->text('Proforma Invoice'),
1254
    purchase_order          => $recipient_locale->text('Purchase Order'),
1255
    request_quotation       => $recipient_locale->text('RFQ'),
1256
    sales_order             => $recipient_locale->text('Confirmation'),
1257
    sales_quotation         => $recipient_locale->text('Quotation'),
1258
    storno_invoice          => $recipient_locale->text('Storno Invoice'),
1259
    sales_delivery_order    => $recipient_locale->text('Delivery Order'),
1260
    purchase_delivery_order => $recipient_locale->text('Delivery Order'),
1261
    dunning                 => $recipient_locale->text('Dunning'),
1258 1262
  );
1259 1263

  
1260 1264
  $main::lxdebug->leave_sub();
1261
  return $formname_translations{$formname}
1265
  return $formname_translations{$formname};
1262 1266
}
1263 1267

  
1264 1268
sub get_number_prefix_for_type {
......
1294 1298
  $main::lxdebug->enter_sub();
1295 1299
  my ($self) = @_;
1296 1300

  
1301
  $self->{recipient_locale} ||=  Locale->lang_to_locale($self->{language});
1302
  my $recipient_locale = Locale->new($self->{recipient_locale});
1303

  
1297 1304
  my $attachment_filename = $main::locale->unquote_special_chars('HTML', $self->get_formname_translation());
1298 1305
  my $prefix              = $self->get_number_prefix_for_type();
1299 1306

  
1300 1307
  if ($self->{preview} && (first { $self->{type} eq $_ } qw(invoice credit_note))) {
1301
    $attachment_filename .= ' (' . $main::locale->text('Preview') . ')' . $self->get_extension_for_format();
1308
    $attachment_filename .= ' (' . $recipient_locale->text('Preview') . ')' . $self->get_extension_for_format();
1302 1309

  
1303 1310
  } elsif ($attachment_filename && $self->{"${prefix}number"}) {
1304 1311
    $attachment_filename .=  "_" . $self->{"${prefix}number"} . $self->get_extension_for_format();
SL/Locale.pm
227 227
  return $text;
228 228
}
229 229

  
230
sub lang_to_locale {
231
  my ($self, $requested_lang) = @_;
232

  
233
  my $requested_locale;
234
  $requested_locale = 'de' if $requested_lang =~ m/^_(de|deu|ger)/i;
235
  $requested_locale = 'fr' if $requested_lang =~ m/^_(en|uk|us|gr)/i;
236
  $requested_locale = 'en' if $requested_lang =~ m/^_fr/i;
237
  $requested_locale ||= 'de';
238

  
239
  return $requested_locale;
240
}
241

  
230 242
sub findsub {
231 243
  $main::lxdebug->enter_sub();
232 244

  

Auch abrufbar als: Unified diff