harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow translation context with plural. Use that in Likes/Dislikes.

Browse Source
This commit is contained in:
Alexandre Hannud Abdo 2014-05-21 05:32:46 -03:00
parent ac8400ac0c
commit d15e3776f3
5 changed files with 5707 additions and 5513 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/ItemObject.php
View File

@ -131,12 +131,12 @@ class Item extends BaseObject {
} else { } else {
$like_list_part = ''; $like_list_part = '';
} }
$like_button_label = ((x($alike,$item['mid'])) && ($alike[$item['mid']] < 2 ) ? t('Like') : t('Likes')); $like_button_label = tt('Like','Likes',$like_count,'noun');
if (feature_enabled($conv->get_profile_owner(),'dislike')) { if (feature_enabled($conv->get_profile_owner(),'dislike')) {
$dislike_count = ((x($dlike,$item['mid'])) ? $dlike[$item['mid']] : ''); $dislike_count = ((x($dlike,$item['mid'])) ? $dlike[$item['mid']] : '');
$dislike_list = ((x($dlike,$item['mid'])) ? $dlike[$item['mid'] . '-l'] : ''); $dislike_list = ((x($dlike,$item['mid'])) ? $dlike[$item['mid'] . '-l'] : '');
$dislike_button_label = ((x($dlike,$item['mid'])) && ($dlike[$item['mid']] < 2) ? t('Dislike') : t('Dislikes')); $dislike_button_label = tt('Dislike','Dislikes',$dislike_count,'noun');
if (count($dislike_list) > MAX_LIKERS) { if (count($dislike_list) > MAX_LIKERS) {
$dislike_list_part = array_slice($dislike_list, 0, MAX_LIKERS); $dislike_list_part = array_slice($dislike_list, 0, MAX_LIKERS);
array_push($dislike_list_part, '<a href="#" data-toggle="modal" data-target="#dislikeModal-' . $this->get_id() . '"><b>' . t('View all') . '</b></a>'); array_push($dislike_list_part, '<a href="#" data-toggle="modal" data-target="#dislikeModal-' . $this->get_id() . '"><b>' . t('View all') . '</b></a>');
@ -276,8 +276,8 @@ class Item extends BaseObject {
'like_list' => $like_list, 'like_list' => $like_list,
'like_list_part' => $like_list_part, 'like_list_part' => $like_list_part,
'like_button_label' => $like_button_label, 'like_button_label' => $like_button_label,
'like_modal_title' => t('Likes'), 'like_modal_title' => t('Likes','noun'),
'dislike_modal_title' => t('Dislikes'), 'dislike_modal_title' => t('Dislikes','noun'),
'dislike_count' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_count : ''), 'dislike_count' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_count : ''),
'dislike_list' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_list : ''), 'dislike_list' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_list : ''),
'dislike_list_part' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_list_part : ''), 'dislike_list_part' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_list_part : ''),

7
include/language.php
View File

@ -162,11 +162,12 @@ function t($s,$ctx = '') {
} }
function tt($singular, $plural, $count){ function tt($singular, $plural, $count, $ctx = ''){
$a = get_app(); $a = get_app();
if(x($a->strings,$singular)) { $cs = $ctx?"__ctx:".$ctx."__ ".$singular:$singular;
$t = $a->strings[$singular]; if(x($a->strings,$cs)) {
$t = $a->strings[$cs];
$f = 'string_plural_select_' . str_replace('-', '_', $a->language); $f = 'string_plural_select_' . str_replace('-', '_', $a->language);
if(! function_exists($f)) if(! function_exists($f))
$f = 'string_plural_select_default'; $f = 'string_plural_select_default';

8804
util/messages.po
View File

File diff suppressed because it is too large Load Diff

2
util/run_xgettext.sh
View File

@ -44,7 +44,7 @@ OPTS=
# fi # fi
#fi #fi
KEYWORDS="-k -kt:1 -kt:1,2c,2t -ktt:1,2" KEYWORDS="-k -kt:1 -kt:1,2c,2t -ktt:1,2 -ktt:1,2,4c,4t"
echo "extract strings to $OUTFILE.." echo "extract strings to $OUTFILE.."

2399
util/strings.php
View File

File diff suppressed because it is too large Load Diff