Skip to content

[FIX] Workspace input without i18n #2689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diegolmello merged 3 commits into from
Jan 20, 2021
Merged

[FIX] Workspace input without i18n #2689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a029915
[FIX] Translation of strings in Login page
sumukhah Dec 4, 2020
88ac174
Merge branch 'develop' into translation
diegolmello Jan 20, 2021
0a86ba7
Add pt-BR
diegolmello Jan 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/i18n/locales/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,5 +702,7 @@ export default {
The_user_will_be_removed_from_s: 'The user will be removed from {{s}}',
Yes_remove_user: 'Yes, remove user!',
Direct_message: 'Direct message',
Message_Ignored: 'Message ignored. Tap to display it.'
Message_Ignored: 'Message ignored. Tap to display it.',
Enter_workspace_URL: 'Enter workspace URL',
Workspace_URL_Example: 'Ex. your-company.rocket.chat'
Copy link
Contributor Author

@sumukhah sumukhah Dec 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I provide key-value 'Ex. your-company.rocket.chat', will result in an error.
For that reason, changed it's key name to be Workspace_URL_Example

Screenshot 2020-12-07 at 5 33 02 PM

};
4 changes: 3 additions & 1 deletion app/i18n/locales/pt-BR.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,5 +649,7 @@ export default {
The_user_will_be_removed_from_s: 'O usuário será removido de {{s}}',
Yes_remove_user: 'Sim, remover usuário!',
Direct_message: 'Mensagem direta',
Message_Ignored: 'Mensagem ignorada. Toque para mostrar.'
Message_Ignored: 'Mensagem ignorada. Toque para mostrar.',
Enter_workspace_URL: 'Digite a URL da sua workspace',
Workspace_URL_Example: 'Ex. sua-empresa.rocket.chat'
};
5 changes: 3 additions & 2 deletions app/views/NewServerView/ServerInput/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import TextInput from '../../../containers/TextInput';
import * as List from '../../../containers/List';
import { themes } from '../../../constants/colors';
import Item from './Item';
import I18n from '../../../i18n';

const styles = StyleSheet.create({
container: {
Expand Down Expand Up @@ -42,8 +43,8 @@ const ServerInput = ({
return (
<View style={styles.container}>
<TextInput
label='Enter workspace URL'
placeholder='Ex. your-company.rocket.chat'
label={I18n.t('Enter_workspace_URL')}
placeholder={I18n.t('Workspace_URL_Example')}
containerStyle={styles.inputContainer}
value={text}
returnKeyType='send'
Expand Down