ecency/ecency-mobile
1
1
Fork 0
mirror of https://github.com/ecency/ecency-mobile.git synced 2024-12-22 21:01:31 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1013 from esteemapp/locale-typo-todo

Browse Source 
typo locale fix and todo: move toast messages to locales
This commit is contained in:
Mustafa Buyukcelebi 2019-08-05 15:47:23 +03:00 committed by GitHub
commit a31a476ad1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -57,6 +57,7 @@ buck-out/
config.js
!src/screens/steem-connect/config.js
android/app/google-services.json
keystore/
.env
package-lock.json

44
ios/Pods/Pods.xcodeproj/xcuserdata/f.xcuserdatad/xcschemes/xcschememanagement.plist generated
View File

@ -9,154 +9,154 @@
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>7</integer>
<integer>3</integer>
</dict>
<key>AppCenterReactNativeShared.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>8</integer>
<integer>4</integer>
</dict>
<key>BugsnagReactNative.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>10</integer>
<integer>6</integer>
</dict>
<key>CodePush.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>11</integer>
<integer>7</integer>
</dict>
<key>DoubleConversion.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>12</integer>
<integer>8</integer>
</dict>
<key>FLAnimatedImage.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>13</integer>
<integer>9</integer>
</dict>
<key>Folly.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>14</integer>
<integer>10</integer>
</dict>
<key>Pods-eSteem-tvOS.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>17</integer>
<integer>13</integer>
</dict>
<key>Pods-eSteem-tvOSTests.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>18</integer>
<integer>14</integer>
</dict>
<key>Pods-eSteem.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>16</integer>
<integer>12</integer>
</dict>
<key>Pods-eSteemTests.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>19</integer>
<integer>15</integer>
</dict>
<key>QBImagePickerController-QBImagePicker.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>21</integer>
<integer>17</integer>
</dict>
<key>QBImagePickerController.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>20</integer>
<integer>16</integer>
</dict>
<key>RNIap.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>25</integer>
<integer>21</integer>
</dict>
<key>RNImageCropPicker.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>26</integer>
<integer>22</integer>
</dict>
<key>RSKImageCropper.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>27</integer>
<integer>23</integer>
</dict>
<key>SDWebImage.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>28</integer>
<integer>24</integer>
</dict>
<key>boost-for-react-native.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>9</integer>
<integer>5</integer>
</dict>
<key>glog.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>15</integer>
<integer>11</integer>
</dict>
<key>react-native-fast-image.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>22</integer>
<integer>18</integer>
</dict>
<key>react-native-netinfo.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>23</integer>
<integer>19</integer>
</dict>
<key>react-native-version-number.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>24</integer>
<integer>20</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>

2
ios/eSteem.xcodeproj/xcuserdata/f.xcuserdatad/xcschemes/xcschememanagement.plist
View File

@ -12,7 +12,7 @@
<key>eSteem.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>29</integer>
<integer>30</integer>
</dict>
</dict>
</dict>

BIN
ios/eSteem.xcworkspace/xcuserdata/f.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

19
src/config/locales/en-US.json
View File

@ -20,7 +20,7 @@
"ignore": "ignored you",
"reblog": "reblogged your post",
"transfer": "transfered steem",
"comingsoon": "Leaderboard feature is coming soon!",
"comingsoon": "Feature is coming soon!",
"notification": "Notifications",
"leaderboard": "Leaderboard",
"epoint": "Points",
@ -121,11 +121,12 @@
"always_warn": "Always warn"
},
"feedback_success": "Email successfully open",
"feedback_fail": "Email client could not open"
"feedback_fail": "Email client could not open",
"server_fail": "Server not available"
},
"voters": {
"voters_info": "Voters Info",
"no_user": "No user found."
"no_user": "User is not found."
},
"login": {
"signin": "Sign in",
@ -190,7 +191,7 @@
"fail": "Fail!",
"move": "Move",
"move_question": "Are you sure to move to drafts?",
"success_shared": "Your post succesfully shared",
"success_shared": "Your post successfully shared",
"success_moved": "Moved to draft",
"permission_denied": "Permission denied",
"permission_text": "Please, go to phone Settings and change eSteem app permissions.",
@ -211,10 +212,12 @@
"same_user": "This user already added to list",
"unknow_error": "An error occurred",
"error": "Error",
"fetch_error": "Fetching data from server failed, please try again or notify us at info@esteem.app"
"fetch_error": "Fetching data failed, please try again or notify us at info@esteem.app",
"connection_fail": "Connection Failed!",
"connection_success": "Successfully connected!"
},
"post": {
"reblog_alert": "Are you sure you want to reblog?",
"reblog_alert": "Are you sure, you want to reblog?",
"removed_hint": "The post was removed by",
"copy_link": "Copy Link",
"reblogged": "reblogged by",
@ -290,7 +293,7 @@
"to": "To",
"amount": "Amount",
"memo": "Memo",
"information": "Are you sure to transfer to funds?",
"information": "Are you sure to transfer funds?",
"amount_desc": "Balance",
"memo_desc": "This memo is public",
"to_placeholder": "Username",
@ -314,7 +317,7 @@
"user": "User",
"permlink": "Post",
"permlinkPlaceholder": "author/permlink",
"information": "Are you sure to transfer to promote?"
"information": "Are you sure to promote?"
},
"boostPost": {
"title": "Boost"

9
src/screens/settings/container/settingsContainer.js
View File

@ -103,7 +103,7 @@ class SettingsContainer extends Component {
};
_changeApi = async action => {
const { dispatch, selectedApi } = this.props;
const { dispatch, selectedApi, intl } = this.props;
const { serverList } = this.state;
const server = serverList[action];
let serverResp;
@ -116,9 +116,10 @@ class SettingsContainer extends Component {
serverResp = await client.database.getDynamicGlobalProperties();
} catch (e) {
isError = true;
dispatch(toastNotification('Connection Failed!'));
dispatch(toastNotification(intl.formatMessage({ id: 'alert.connection_fail' })));
} finally {
if (!isError) dispatch(toastNotification('Succesfuly connected!'));
if (!isError)
dispatch(toastNotification(intl.formatMessage({ id: 'alert.connection_success' })));
}
if (!isError) {
@ -127,7 +128,7 @@ class SettingsContainer extends Component {
const isAlive = localTime - serverTime < 15000;
if (!isAlive) {
dispatch(toastNotification('Server not available'));
dispatch(toastNotification(intl.formatMessage({ id: 'alert.server_fail' })));
isError = true;
return;