diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-31 15:00:04 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-31 15:00:04 -0400 |
| commit | 94ce8f2168bdd9897f54ec433ad7017fb3db1cc8 (patch) | |
| tree | db031ac7fd4788be6593e258d170c8f134533e4b /apps/media | |
| parent | 269922543eaf9e69dbf5a15fa0ba34704040b09c (diff) | |
| parent | dfae77dec1650f171d09d4bde88ab74029f6e8c7 (diff) | |
| download | nextcloud-server-94ce8f2168bdd9897f54ec433ad7017fb3db1cc8.tar.gz nextcloud-server-94ce8f2168bdd9897f54ec433ad7017fb3db1cc8.zip | |
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/app.php
apps/files_sharing/js/share.js
Diffstat (limited to 'apps/media')
| -rw-r--r-- | apps/media/l10n/vi.php | 14 | ||||
| -rw-r--r-- | apps/media/lib_ampache.php | 5 |
2 files changed, 17 insertions, 2 deletions
diff --git a/apps/media/l10n/vi.php b/apps/media/l10n/vi.php new file mode 100644 index 00000000000..01942ba173f --- /dev/null +++ b/apps/media/l10n/vi.php @@ -0,0 +1,14 @@ +<?php $TRANSLATIONS = array( +"Music" => "Âm nhạc", +"Add album to playlist" => "Thêm album vào playlist", +"Play" => "Play", +"Pause" => "Tạm dừng", +"Previous" => "Trang trước", +"Next" => "Tiếp theo", +"Mute" => "Tắt", +"Unmute" => "Bật", +"Rescan Collection" => "Quét lại bộ sưu tập", +"Artist" => "Nghệ sỹ", +"Album" => "Album", +"Title" => "Tiêu đề" +); diff --git a/apps/media/lib_ampache.php b/apps/media/lib_ampache.php index d5a093338cc..4951399fa18 100644 --- a/apps/media/lib_ampache.php +++ b/apps/media/lib_ampache.php @@ -150,6 +150,7 @@ class OC_MEDIA_AMPACHE{ $users=$query->execute(array($auth))->fetchAll(); if(count($users)>0){ OC_MEDIA_COLLECTION::$uid=$users[0]['user_id']; + OC_User::setUserId($users[0]['user_id']); return $users[0]['user_id']; }else{ return false; @@ -271,7 +272,7 @@ class OC_MEDIA_AMPACHE{ </root>"); return; } - $filter=$params['filter']; + $filter = isset($params['filter']) ? $params['filter'] : ''; $albums=OC_MEDIA_COLLECTION::getAlbums($filter); $artist=OC_MEDIA_COLLECTION::getArtistName($filter); echo('<?xml version="1.0" encoding="UTF-8"?>'); @@ -400,7 +401,7 @@ class OC_MEDIA_AMPACHE{ </root>"); return; } - $filter=$params['filter']; + $filter = isset($params['filter']) ? $params['filter'] : ''; $artists=OC_MEDIA_COLLECTION::getArtists($filter); $albums=OC_MEDIA_COLLECTION::getAlbums(0,$filter); $songs=OC_MEDIA_COLLECTION::getSongs(0,0,$filter); |