Skip to content

#33 (Translation): Correction for use pt_BR translation #50

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

#33 (Translation): Correction for use pt_BR translation #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b17d68a
#33 (Translation): Correction for use pt_BR translation
fabiodepin Mar 2, 2016
c0ddb7d
Fixed Portuguese Brasilian translate
fabiodepin Mar 2, 2016
efd5816
Fixed filter style aligment
fabiodepin Mar 2, 2016
2515027
Added extra sample to identify Hostname portion of XMPP.
fabiodepin Mar 2, 2016
be71497
Added translation (portuguese brasilian) to input contact search 'Typ…
fabiodepin Mar 3, 2016
0d853cb
Bug fixed in search contacts. Press backspace in empty input search, …
fabiodepin Mar 3, 2016
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
11 changes: 11 additions & 0 deletions config.inc.php.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,17 @@ $rcmail_config['converse_xmpp_hostname']= function($args) {
return 'example.net';
# return preg_replace('/^.*@/', '', $args['user']);
# return $args['host'];

#if (strstr($args['user'], "@")){
# return preg_replace('/^.*@/', '', $args['user']);
#} else {
# $host = $_SERVER['HTTP_HOST'];
# $domain = isset($host) ? $host : '';
# if (preg_match('/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.[a-z\.]{2,6})$/i', $domain, $regs)) {
# $host = $regs['domain'];
# }
# return $host;
#}
};

// Username portion of XMPP username (bare JID), example: "user"
Expand Down
4 changes: 2 additions & 2 deletions css/converse.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -965,7 +965,7 @@ dl.add-converse-contact {
width: 100%;
position: relative;
margin: 0.5em 0 0 0;
height: 194px;
height: 100%;
height: calc(100% - 68px);
overflow: hidden;
}
Expand All @@ -981,7 +981,7 @@ dl.add-converse-contact {
#converse-roster .filter-type {
height: 20px;
padding: 0;
margin: 0 0 0 -5px;
margin: 0 0 0 0px;
}
/* (jQ addClass:) if input has value: */
#converse-roster .roster-filter.x {
Expand Down
2 changes: 1 addition & 1 deletion css/converse.min.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/converse-no-otr.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/converse.min.js
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions skins/larry/converse.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,11 @@
}

#converse-roster {
height: 196px;
width:100%;
position:relative;
margin:.5em 0 0;
height:100%;
height:calc(100% - 68px);
overflow: hidden;
}

Expand Down Expand Up @@ -154,8 +158,10 @@ div#settings

#converse-roster .roster-filter {
width: 93px;
height: 18px;
vertical-align: top;
}

#converse-roster .filter-type {
width: 94px;
width: 85px;
}