Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 1a1bdd3d

Von Moritz Bunkus vor fast 8 Jahren hinzugefügt

  • ID 1a1bdd3dcfccee2b6b6b2b36f95aad0dd64132c1
  • Vorgänger 9871f82b
  • Nachfolger 9fe5b41d

Einheiten bearbeiten: SL::DB::Language nutzen

Alter Code zum Auslesen der Sprachliste, AM::language, wurde im Zuge
der ActionBar-Umstellung entfernt.

Ups :)

Unterschiede anzeigen:

bin/mozilla/am.pl
808 808
  AM->units_in_use(\%myconfig, $form, $units);
809 809
  map({ $units->{$_}->{"BASE_UNIT_DDBOX"} = AM->unit_select_data($units, $units->{$_}->{"base_unit"}, 1); } keys(%{$units}));
810 810

  
811
  my @languages = AM->language(\%myconfig, $form, 1);
811
  my @languages = @{ SL::DB::Manager::Language->get_all_sorted };
812 812

  
813 813
  my @unit_list = sort({ $a->{"sortkey"} <=> $b->{"sortkey"} } values(%{$units}));
814 814

  
......
818 818
    $_->{"UNITLANGUAGES"} = [];
819 819
    foreach my $lang (@languages) {
820 820
      push(@{ $_->{"UNITLANGUAGES"} },
821
           { "idx" => $i,
822
             "unit" => $_->{"name"},
823
             "language_id" => $lang->{"id"},
824
             "localized" => $_->{"LANGUAGES"}->{$lang->{"template_code"}}->{"localized"},
825
             "localized_plural" => $_->{"LANGUAGES"}->{$lang->{"template_code"}}->{"localized_plural"},
821
           { "idx"              => $i,
822
             "unit"             => $_->{"name"},
823
             "language_id"      => $lang->id,
824
             "localized"        => $_->{"LANGUAGES"}->{$lang->template_code}->{"localized"},
825
             "localized_plural" => $_->{"LANGUAGES"}->{$lang->template_code}->{"localized_plural"},
826 826
           });
827 827
    }
828 828
    $i++;
......
867 867
  }
868 868

  
869 869
  my @languages;
870
  foreach my $lang (AM->language(\%myconfig, $form, 1)) {
870
  foreach my $lang (@{ SL::DB::Manager::Language->get_all_sorted }) {
871 871
    next unless ($form->{"new_localized_$lang->{id}"} || $form->{"new_localized_plural_$lang->{id}"});
872
    push(@languages, { "id" => $lang->{"id"},
873
                       "localized" => $form->{"new_localized_$lang->{id}"},
874
                       "localized_plural" => $form->{"new_localized_plural_$lang->{id}"},
872
    push(@languages, { "id"               => $lang->id,
873
                       "localized"        => $form->{"new_localized_" . $lang->id},
874
                       "localized_plural" => $form->{"new_localized_plural_" . $lang->id},
875 875
         });
876 876
  }
877 877

  
......
897 897

  
898 898
  foreach my $lang (@{$languages}) {
899 899
    push(@{ $unit->{"LANGUAGES"} },
900
         { "id" => $lang->{"id"},
901
           "localized" => $form->{"localized_${idx}_$lang->{id}"},
902
           "localized_plural" => $form->{"localized_plural_${idx}_$lang->{id}"},
900
         { "id"               => $lang->id,
901
           "localized"        => $form->{"localized_${idx}_" . $lang->id},
902
           "localized_plural" => $form->{"localized_plural_${idx}_" . $lang->id},
903 903
         });
904 904
  }
905 905

  
......
918 918
  my $old_units = AM->retrieve_units(\%myconfig, $form, "resolved_");
919 919
  AM->units_in_use(\%myconfig, $form, $old_units);
920 920

  
921
  my @languages = AM->language(\%myconfig, $form, 1);
921
  my @languages = @{ SL::DB::Manager::Language->get_all_sorted };
922 922

  
923 923
  my $new_units = {};
924 924
  my @delete_units = ();

Auch abrufbar als: Unified diff