View | Details | Raw Unified | Return to bug 20307
Collapse All | Expand All

(-)a/Koha/AuthorisedValue.pm (-6 / +6 lines)
Lines 71-78 sub opac_translated_description { Link Here
71
    return $self->translated_description unless $self->lib_opac;
71
    return $self->translated_description unless $self->lib_opac;
72
72
73
    my $translated_description = Koha::Localizations->search({
73
    my $translated_description = Koha::Localizations->search({
74
        code => sprintf( "%s_%s", $self->category, $self->authorised_value ),
74
        code => $self->authorised_value,
75
        entity => 'authorised_values',
75
        entity => 'authorised_values:' . $self->category,
76
        lang => $lang,
76
        lang => $lang,
77
        interface => 'opac',
77
        interface => 'opac',
78
    })->next;
78
    })->next;
Lines 97-104 sub translated_description { Link Here
97
    }
97
    }
98
    $lang ||= C4::Languages::getlanguage;
98
    $lang ||= C4::Languages::getlanguage;
99
    my $translated_description = Koha::Localizations->search({
99
    my $translated_description = Koha::Localizations->search({
100
        code => sprintf( "%s_%s", $self->category, $self->authorised_value ),
100
        code => $self->authorised_value,
101
        entity => 'authorised_values',
101
        entity => 'authorised_values:' . $self->category,
102
        lang => $lang,
102
        lang => $lang,
103
    })->next;
103
    })->next;
104
    return $translated_description
104
    return $translated_description
Lines 113-120 sub translated_description { Link Here
113
sub translated_descriptions {
113
sub translated_descriptions {
114
    my ( $self ) = @_;
114
    my ( $self ) = @_;
115
    my @translated_descriptions = Koha::Localizations->search(
115
    my @translated_descriptions = Koha::Localizations->search(
116
        {   entity => 'authorised_values',
116
        {   entity => 'authorised_values:' . $self->category,
117
            code => sprintf( "%s_%s", $self->category, $self->authorised_value ),
117
            code => $self->authorised_value,
118
        }
118
        }
119
    );
119
    );
120
    return [ map {
120
    return [ map {
(-)a/Koha/Schema/Result/AuthorisedValue.pm (-1 / +1 lines)
Lines 159-165 __PACKAGE__->has_many( Link Here
159
        die "no interface specified!" unless $INTERFACE;
159
        die "no interface specified!" unless $INTERFACE;
160
160
161
        return ({
161
        return ({
162
            "$args->{foreign_alias}.code" => \["= CONCAT(me.category, '_', me.authorised_value)"],
162
            "$args->{foreign_alias}.entity" => \["= CONCAT('authorised_values:', me.category)"],
163
            "$args->{foreign_alias}.lang" => $LANGUAGE,
163
            "$args->{foreign_alias}.lang" => $LANGUAGE,
164
            "$args->{foreign_alias}.interface" => $INTERFACE,
164
            "$args->{foreign_alias}.interface" => $INTERFACE,
165
        });
165
        });
(-)a/Koha/Schema/Result/AuthorisedValueLocalization.pm (-1 / +1 lines)
Lines 9-15 __PACKAGE__->table_class('DBIx::Class::ResultSource::View'); Link Here
9
__PACKAGE__->table('authorised_value_localizations');
9
__PACKAGE__->table('authorised_value_localizations');
10
__PACKAGE__->result_source_instance->is_virtual(1);
10
__PACKAGE__->result_source_instance->is_virtual(1);
11
__PACKAGE__->result_source_instance->view_definition(
11
__PACKAGE__->result_source_instance->view_definition(
12
    "SELECT localization_id, code, lang, translation, interface FROM localization WHERE entity='authorised_values'"
12
    "SELECT localization_id, entity, code, lang, translation, interface FROM localization WHERE entity LIKE 'authorised_values:%'"
13
);
13
);
14
14
15
__PACKAGE__->add_columns(
15
__PACKAGE__->add_columns(
(-)a/t/db_dependent/AuthorisedValues.t (-11 / +10 lines)
Lines 258-265 subtest "localization" => sub { Link Here
258
    );    # no translation
258
    );    # no translation
259
    Koha::Localization->new(
259
    Koha::Localization->new(
260
        {
260
        {
261
            entity => 'authorised_values',
261
            entity => 'authorised_values:' . $av1->category,
262
            code => sprintf( "%s_%s", $av1->category, $av1->authorised_value ),
262
            code => $av1->authorised_value,
263
            lang => 'es-ES',
263
            lang => 'es-ES',
264
            interface => 'intranet',
264
            interface => 'intranet',
265
            translation => 'traducción 1'
265
            translation => 'traducción 1'
Lines 267-274 subtest "localization" => sub { Link Here
267
    )->store;
267
    )->store;
268
    Koha::Localization->new(
268
    Koha::Localization->new(
269
        {
269
        {
270
            entity => 'authorised_values',
270
            entity => 'authorised_values:' . $av1->category,
271
            code => sprintf( "%s_%s", $av1->category, $av1->authorised_value ),
271
            code => $av1->authorised_value,
272
            lang => 'es-ES',
272
            lang => 'es-ES',
273
            interface => 'opac',
273
            interface => 'opac',
274
            translation => 'opac traducción 1'
274
            translation => 'opac traducción 1'
Lines 276-283 subtest "localization" => sub { Link Here
276
    )->store;
276
    )->store;
277
    Koha::Localization->new(
277
    Koha::Localization->new(
278
        {
278
        {
279
            entity => 'authorised_values',
279
            entity => 'authorised_values:' . $av1->category,
280
            code => sprintf( "%s_%s", $av1->category, $av2->authorised_value ),
280
            code => $av2->authorised_value,
281
            lang => 'es-ES',
281
            lang => 'es-ES',
282
            interface => 'intranet',
282
            interface => 'intranet',
283
            translation => 'traducción 2'
283
            translation => 'traducción 2'
Lines 286-293 subtest "localization" => sub { Link Here
286
286
287
    Koha::Localization->new(
287
    Koha::Localization->new(
288
        {
288
        {
289
            entity => 'authorised_values',
289
            entity => 'authorised_values:' . $av1->category,
290
            code => sprintf( "%s_%s", $av1->category, $av1->authorised_value ),
290
            code => $av1->authorised_value,
291
            lang => 'fr-FR',
291
            lang => 'fr-FR',
292
            interface => 'intranet',
292
            interface => 'intranet',
293
            translation => 'traduction 1'
293
            translation => 'traduction 1'
Lines 295-302 subtest "localization" => sub { Link Here
295
    )->store;
295
    )->store;
296
    Koha::Localization->new(
296
    Koha::Localization->new(
297
        {
297
        {
298
            entity => 'authorised_values',
298
            entity => 'authorised_values:' . $av2->category,
299
            code => sprintf( "%s_%s", $av2->category, $av2->authorised_value ),
299
            code => $av2->authorised_value,
300
            lang => 'de-DE',
300
            lang => 'de-DE',
301
            interface => 'intranet',
301
            interface => 'intranet',
302
            translation => 'Übersetzung 2'
302
            translation => 'Übersetzung 2'
303
- 

Return to bug 20307