Bug 15487: Fix encoding issue on localization
authorJonathan Druart <jonathan.druart@bugs.koha-community.org>
Wed, 6 Jan 2016 16:59:22 +0000 (16:59 +0000)
committerBrendan Gallagher <brendan@bywatersolutions.com>
Tue, 12 Jan 2016 16:10:36 +0000 (16:10 +0000)
It has been introduced
  commit ed0ff59152a41f6690b480d0b13b607250678418
    Bug 11559: Supporting changes for Rancor

Pushed at the same time as bug 14100.

Test plan:
Add/update translations for item types, confirm there is no encoding
issues.

Signed-off-by: Marc VĂ©ron <veron@veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
svc/localization

index 2bf3c69..1f10f67 100755 (executable)
@@ -13,11 +13,11 @@ sub get_translations {
     my @translations;
     while ( my $s = $rs->next ) {
         push @translations, {
-              id          => Encode::encode( 'utf-8', $s->localization_id ),
-              entity      => Encode::encode( 'utf-8', $s->entity ),
-              code        => Encode::encode( 'utf-8', $s->code ),
-              lang        => Encode::encode( 'utf-8', $s->lang ),
-              translation => Encode::encode( 'utf-8', $s->translation ),
+              id          => $s->localization_id,
+              entity      => $s->entity,
+              code        => $s->code,
+              lang        => $s->lang,
+              translation => $s->translation,
         }
     }
     $response->param( translations => \@translations );
@@ -47,11 +47,11 @@ sub update_translation {
     }
     $response->param(
         %params,
-        id          => Encode::encode('utf-8', $localization->localization_id),
-        entity      => Encode::encode('utf-8', $localization->entity),
-        code        => Encode::encode('utf-8', $localization->code),
-        lang        => Encode::encode('utf-8', $localization->lang),
-        translation => Encode::encode('utf-8', $localization->translation),
+        id          => $localization->localization_id,
+        entity      => $localization->entity,
+        code        => $localization->code,
+        lang        => $localization->lang,
+        translation => $localization->translation,
     );
     C4::Service->return_success( $response );
 }
@@ -73,11 +73,11 @@ sub add_translation {
         );
         $localization->store;
         $response->param(
-            id          => Encode::encode('utf-8', $localization->localization_id),
-            entity      => Encode::encode('utf-8', $localization->entity),
-            code        => Encode::encode('utf-8', $localization->code),
-            lang        => Encode::encode('utf-8', $localization->lang),
-            translation => Encode::encode('utf-8', $localization->translation),
+            id          => $localization->localization_id,
+            entity      => $localization->entity,
+            code        => $localization->code,
+            lang        => $localization->lang,
+            translation => $localization->translation,
         );
 
     } else {