Merge pull request #78 from VocaDB/develop

Develop
VocaDB · Oct 17, 2018 · c362aaf · c362aaf
2 parents 056adcb + b8048b4
commit c362aaf
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 6 deletions.
diff --git a/ios/VocaDB/Info.plist b/ios/VocaDB/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.6</string>
+	<string>2.0.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>20</string>
+	<string>21</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     ]
   },
   "description": "VocaDB app is a mobile version of vocadb.net",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "private": false,
   "devDependencies": {
     "@storybook/addon-actions": "^3.3.12",

diff --git a/src/common/constants/labels.js b/src/common/constants/labels.js
@@ -157,6 +157,8 @@ export default {
     contact: 'contact',
     contactDescription: 'contactDescription',
     developerContact: 'developerContact',
-    developerContactDescription: 'developerContactDescription'
+    developerContactDescription: 'developerContactDescription',
+    artistNotFound: 'artistNotFound',
+    artistNotFoundDescription: 'artistNotFoundDescription'
 
 };
diff --git a/src/common/i18n/locales/en.js b/src/common/i18n/locales/en.js
@@ -152,6 +152,8 @@ t[labels.searchYoutube] = 'Search Youtube';
 t[labels.showAll] = 'Show all';
 t[labels.developerContact] = 'Developer contacts';
 t[labels.developerContactDescription] = 'Suggestion, Feedback or report any issue are welcome';
+t[labels.artistNotFound] = 'Artist not found';
+t[labels.artistNotFoundDescription] = 'This artist not exists in database';
 
 // Menu
 t[labels.favoriteSongs] = 'Favorite songs';

diff --git a/src/common/i18n/locales/ja.js b/src/common/i18n/locales/ja.js
@@ -152,6 +152,8 @@ t[labels.searchYoutube] = 'Search Youtube';
 t[labels.showAll] = 'Show all';
 t[labels.developerContact] = 'Developer contacts';
 t[labels.developerContactDescription] = 'Suggestion, Feedback or report any issue are welcome';
+t[labels.artistNotFound] = 'Artist not found';
+t[labels.artistNotFoundDescription] = 'This artist not exists in database';
 
 // Menu
 t[labels.favoriteSongs] = 'Favorite songs';

diff --git a/src/common/i18n/locales/ms.js b/src/common/i18n/locales/ms.js
@@ -152,6 +152,8 @@ t[labels.searchYoutube] = 'Search Youtube';
 t[labels.showAll] = 'Show all';
 t[labels.developerContact] = 'Developer contacts';
 t[labels.developerContactDescription] = 'Suggestion, Feedback or report any issue are welcome';
+t[labels.artistNotFound] = 'Artist not found';
+t[labels.artistNotFoundDescription] = 'This artist not exists in database';
 
 // Menu
 t[labels.favoriteSongs] = 'Lagu kegemaran';

diff --git a/src/common/i18n/locales/ru.js b/src/common/i18n/locales/ru.js
@@ -152,6 +152,8 @@ t[labels.searchYoutube] = 'Search Youtube';
 t[labels.showAll] = 'Show all';
 t[labels.developerContact] = 'Developer contacts';
 t[labels.developerContactDescription] = 'Suggestion, Feedback or report any issue are welcome';
+t[labels.artistNotFound] = 'Artist not found';
+t[labels.artistNotFoundDescription] = 'This artist not exists in database';
 
 // Menu
 t[labels.favoriteSongs] = 'Favorite songs';

diff --git a/src/common/i18n/locales/th.js b/src/common/i18n/locales/th.js
@@ -152,6 +152,8 @@ t[labels.searchYoutube] = 'ลองค้นหาบน Youtube';
 t[labels.showAll] = 'แสดงทั้งหมด';
 t[labels.developerContact] = 'ติดต่อนักพัฒนา';
 t[labels.developerContactDescription] = 'มีคำถาม ข้อเสนอแนะ หรือพบปัญหาใดๆสามารถแจ้งได้ตามช่องทางต่างๆดังนี้';
+t[labels.artistNotFound] = 'ไม่พบข้อมูลศิลปิน';
+t[labels.artistNotFoundDescription] = 'ข้อมูลของศิลปินดังกล่าวไม่อยู่ในฐานข้อมูล';
 
 // Menu
 t[labels.favoriteSongs] = 'เพลงโปรด';

diff --git a/src/common/i18n/locales/zh.js b/src/common/i18n/locales/zh.js
@@ -152,6 +152,8 @@ t[labels.searchYoutube] = 'Search Youtube';
 t[labels.showAll] = 'Show all';
 t[labels.developerContact] = 'Developer contacts';
 t[labels.developerContactDescription] = 'Suggestion, Feedback or report any issue are welcome';
+t[labels.artistNotFound] = 'Artist not found';
+t[labels.artistNotFoundDescription] = 'This artist not exists in database';
 
 // Menu
 t[labels.favoriteSongs] = 'Favorite songs';

diff --git a/src/features/artistRole/ArtistRoleList/ArtistRoleList.js b/src/features/artistRole/ArtistRoleList/ArtistRoleList.js
@@ -1,11 +1,12 @@
 import React from 'react';
-import { View, Text, SectionList } from 'react-native';
+import { View, Text, SectionList, Alert } from 'react-native';
 import Artist from '../../artist/ArtistRow/index';
 import PropTypes from 'prop-types';
 import images from '../../../common/assets/images';
 import Theme from '../../../theme';
 import _ from 'lodash';
 import { translateArtistType } from './../../artist/artistConstant';
+import i18n from './../../../common/i18n'
 
 class ArtistRole extends React.Component {
 
@@ -25,8 +26,10 @@ class ArtistRole extends React.Component {
                     artist={artist.artistString}
                     role={(displayRole)? artistRole.roles : undefined}
                     onPress={() => {
-                        if(artist.id) {
+                        if(artistRole && artistRole.artist) {
                             this.props.onPressItem(artist)
+                        } else {
+                            Alert.alert("Artist not found", "This artist not exists in database")
                         }
                     }}
                 />