' + str.replace(/<[^>]+>/g, '$&') + '';
+ });
+
+ string = string.replace(/\\[^<]/g, '$&');
+ string = string.replace(/\n/g, '$&');
+ return string;
+ };
+
+ $('td.source').each(function () {
+ var source = $(this);
+
+ source.find('.l10n-string span').each(function () {
+ $(this).html(markup($(this).html()));
+ });
+ });
+
+ $('td.translation').each(function () {
+ var all = $('li.translation', this);
+ var strings = all.find('.l10n-string > span');
+
+ strings.each(function () {
+ var orig = $(this).html(), markedUp = markup(orig);
+ $(this)
+ .html(markedUp)
+ .data('worddiff:original', orig)
+ .data('worddiff:markup', markedUp);
+ });
+
+ var setStatus = function (elem, status, value) {
+ newValue = elem.find('.' + status + ' :checkbox').attr('checked', value).attr('checked');
+ elem[(newValue === undefined ? value : newValue) ? 'addClass' : 'removeClass']('is-' + status);
+ };
+
+ var textareas = all.filter('.new-translation').find('textarea');
+
+ all.each(function () {
+ var translation = $(this);
+ var isTranslation = !translation.is('.no-translation');
+ var siblings = all.not(this).not('.no-translation');
+
+ var removeDiff = function () {
+ strings.worddiffRevert();
+ };
+
+ var updateDiff = function () {
+ removeDiff();
+ if (isTranslation) {
+ var orig = siblings.filter('.is-active');
+ if (!orig.length)
+ orig = siblings.filter('.default');
+ if (!orig.length)
+ orig = all.not('.no-translation').eq(0).not(translation);
+ if (orig.length) {
+ orig = orig.find('.l10n-string > span');
+ translation.find('.l10n-string > span').each(function (i) {
+ $(this).worddiff(orig.get(i), markup);
+ });
+ }
+ }
+ };
+
+ translation.find('> .selector').click(function () {
+ setStatus(translation, 'declined', false);
+ // Mark this as the active translation.
+ setStatus(translation.siblings('.is-active:not(.new-translation)'), 'declined', true);
+ setStatus(translation.siblings('.is-active'), 'active', false);
+ translation.addClass('is-active');
+ });
+
+ translation.find('> .actions .declined :checkbox').change(function () {
+ setStatus(translation, 'declined', this.checked);
+ });
+
+ translation.find('> .actions .stable :checkbox').change(function () {
+ setStatus(translation, 'stable', this.checked);
+ });
+
+ translation.find('> .author span[title]').click(function () {
+ var $this = $(this), html = $this.html();
+ $this.html($this.attr('title')).attr('title', html);
+ });
+
+ translation.find('> .actions .edit').click(function () {
+ var confirmed = undefined;
+ textareas.each(function (i) {
+ var textarea = $(this);
+ var val = textarea.val();
+ if (confirmed || val === textarea.attr('defaultValue') || !val || (confirmed === undefined && (confirmed = confirm("Do you want to overwrite the current suggestion?")))) {
+ textarea.val(translation.find('.l10n-string > span:eq('+ i +')').text()).keyup();
+ if (i == 0) {
+ // Since we can't have multiple focuses, we jut focus the first textarea.
+ textarea.focus();
+ }
+ }
+ });
+
+ });
+
+ if (isTranslation) {
+ translation.find('.l10n-string').dblclick(function () {
+ translation.siblings().not('.new-translation').each(function () {
+ setStatus($(this), 'declined', true);
+ });
+ });
+
+ translation
+ .mouseenter(updateDiff)
+ .mouseleave(removeDiff);
+ }
+
+ if (translation.is('.new-translation')) {
+ translation.find('> .selector').click(function () {
+ textareas.each(function () {
+ var textarea = $(this);
+ if (textarea.val() === '' || textarea.val() === textarea.attr('defaultValue')) {
+ textarea.focus();
+ // Stop checking the other ones.
+ return false;
+ }
+ });
+ });
+
+ var hasContent = function () {
+ for (var i = 0; i < textareas.length; i++) {
+ if (textareas[i].value && textareas[i].value !== textareas[i].defaultValue) {
+ return true;
+ }
+ }
+ return false;
+ };
+
+ var blurTimeout;
+ textareas.each(function (n) {
+ var wrapper = $(this);
+ var textarea = $(this);
+ var text = translation.find('.l10n-string > span').eq(n);
+
+ textarea
+ .focus(function () {
+ translation.addClass('focussed');
+ clearTimeout(blurTimeout);
+ if (textarea.val() === textarea.attr('defaultValue')) {
+ textarea.val('');
+ }
+ })
+ .blur(function () {
+ blurTimeout = setTimeout(function () {
+ translation.removeClass('focussed');
+ if (textarea.val() === '') {
+ textarea.val(textarea.attr('defaultValue'));
+ }
+ translation[hasContent() ? 'addClass' : 'removeClass']('has-content');
+ }, 1000);
+ })
+ .keyup(function () {
+ var val = encode(textarea.val());
+ text
+ .data('worddiff:original', val)
+ .data('worddiff:markup', markup(val));
+ var oldPos = textarea.offset().top;
+ updateDiff();
+ var diff = textarea.offset().top - oldPos;
+ if (diff)
+ window.scrollBy(0, diff);
+ });
+ });
+ }
+ });
+ });
+ });
+})(jQ13);
diff --git l10n_community/images/decline.png l10n_community/images/decline.png
new file mode 100755
index 0000000..c8a5058
Binary files /dev/null and l10n_community/images/decline.png differ
diff --git l10n_community/images/edit.png l10n_community/images/edit.png
new file mode 100755
index 0000000..37aced3
Binary files /dev/null and l10n_community/images/edit.png differ
diff --git l10n_community/images/icon_approval.gif l10n_community/images/icon_approval.gif
deleted file mode 100644
index b4290ba..0000000
Binary files l10n_community/images/icon_approval.gif and /dev/null differ
diff --git l10n_community/images/icon_copy.gif l10n_community/images/icon_copy.gif
deleted file mode 100644
index 4be8507..0000000
Binary files l10n_community/images/icon_copy.gif and /dev/null differ
diff --git l10n_community/images/icon_toolbox.gif l10n_community/images/icon_toolbox.gif
deleted file mode 100644
index 3c3f40e..0000000
Binary files l10n_community/images/icon_toolbox.gif and /dev/null differ
diff --git l10n_community/images/newline.png l10n_community/images/newline.png
deleted file mode 100644
index 5b7c3dc..0000000
Binary files l10n_community/images/newline.png and /dev/null differ
diff --git l10n_community/images/stable-active.png l10n_community/images/stable-active.png
new file mode 100755
index 0000000..53542e7
Binary files /dev/null and l10n_community/images/stable-active.png differ
diff --git l10n_community/images/stable-inactive.png l10n_community/images/stable-inactive.png
new file mode 100755
index 0000000..262915a
Binary files /dev/null and l10n_community/images/stable-inactive.png differ
diff --git l10n_community/images/undecline.png l10n_community/images/undecline.png
new file mode 100755
index 0000000..35ad7c2
Binary files /dev/null and l10n_community/images/undecline.png differ
diff --git l10n_community/import.inc l10n_community/import.inc
index d28e2bb..cc23f7a 100644
--- l10n_community/import.inc
+++ l10n_community/import.inc
@@ -11,7 +11,8 @@
*/
function l10n_community_import_page($langcode) {
$languages = l10n_community_get_languages();
- if (($perm = l10n_community_get_permission($langcode)) == L10N_PERM_ALL) {
+ $permission = l10n_community_get_permission($langcode);
+ if ($permission & L10N_PERMISSION_MODERATE_OWN) {
drupal_set_title(t('Import translations to @language', array('@language' => $languages[$langcode]->name)));
}
else {
@@ -23,13 +24,13 @@ function l10n_community_import_page($langcode) {
l(t('Home'), NULL),
l(t('Translate projects'), 'translate'))
);
- return drupal_get_form('l10n_community_import_form', $langcode, $perm);
+ return drupal_get_form('l10n_community_import_form', $langcode, $permission);
}
/**
* Translation import form.
*/
-function l10n_community_import_form($form_state, $langcode, $perm) {
+function l10n_community_import_form($form_state, $langcode, $permission) {
$form['#attributes']['enctype'] = 'multipart/form-data';
$form['langcode'] = array(
@@ -49,7 +50,7 @@ function l10n_community_import_form($form_state, $langcode, $perm) {
'#description' => t('Check if the translations you import need discussion. If checked, all translations in the imported file will be saved as suggestions.'),
);
// Restrict to suggestions if no permission to submit translations directly.
- if ($perm != L10N_PERM_ALL) {
+ if ($permission & L10N_PERMISSION_MODERATE_OWN) {
$form['is_suggestion']['#type'] = 'value';
$form['is_suggestion']['#value'] = 1;
}
@@ -99,7 +100,7 @@ function l10n_community_import_form_submit($form, &$form_state) {
// Get status report on what was done in the process.
list($inserted, $updated, $unchanged, $suggested) = _l10n_community_import_one_string();
drupal_set_message(t('The translation was successfully imported.'));
- l10n_community_update_message($inserted, $updated, $unchanged, $suggested, 0);
+ l10n_community_update_message(0, 0, $inserted, $updated, $unchanged, $suggested);
cache_clear_all('l10n:stats:'. $form_state['values']['langcode'], 'cache');
}
}
diff --git l10n_community/jquery.worddiff.js l10n_community/jquery.worddiff.js
new file mode 100644
index 0000000..30d7464
--- /dev/null
+++ l10n_community/jquery.worddiff.js
@@ -0,0 +1,183 @@
+(function($) {
+ var Fragment = function (string) {
+ this.content = string;
+ this.equiv = false;
+ };
+
+ Fragment.prototype.toString = function (tag) {
+ if (this.equiv || !tag)
+ return this.content;
+ else
+ return '<' + tag + '>' + this.content + '';
+ };
+
+
+ var moveToEnd = function (a, i, k) {
+ if (!a.equiv && (!k[i-1] || k[i-1].equiv)) {
+ // Find next item equiv item.
+ for (var j = i+1; k[j] && !k[j].equiv; j++);
+ if (k[j] && k[j].content === a.content) {
+ k[i] = k[j];
+ k[j] = a;
+ }
+ }
+ };
+
+ var aggregate = function (a, i, k) {
+ if (!a.equiv && k[i+1] && !k[i+1].equiv) {
+ k[i+1].content = a.content + k[i+1].content;
+ delete k[i];
+ }
+ };
+
+ var join = function (what, t) {
+ return $.map(what, function (a) {
+ if (a) return a.toString(t);
+ }).join('');
+ };
+
+
+ $.wordDiff = {
+ nonWord: /(&.+?;|[\u0000-\u0040\u005B-\u0060\u007B-\u00A9\u00AB-\u00B4\u00B6-\u00B9\u00BB-\u00BF\u00D7\u00F7\u02C2-\u02C5\u02D2-\u02DF\u02E5-\u02EB\u02ED\u02EF-\u036F\u0375\u037E\u0384\u0385\u0387\u03F6\u0482-\u0489\u055A-\u055F\u0589\u058A\u0591-\u05C7\u05F3\u05F4\u0600-\u0603\u0606-\u061B\u061E\u061F\u064B-\u065E\u0660-\u066D\u0670\u06D4\u06D6-\u06E4\u06EA-\u06ED\u06F0-\u06F9\u06FD\u06FE\u0700-\u070D\u070F\u0711\u0730-\u074A\u07A6-\u07B0\u07C0-\u07C9\u07EB-\u07F3\u07F6-\u07F9\u0901-\u0903\u093C\u093E-\u094D\u0951-\u0954\u09E2\u0962-\u0970\u06E7-\u06E9\u0981-\u0983\u09BC\u09BE-\u09C4\u09C7\u09C8\u09CB-\u09CD\u09D7\u09E3\u09E6-\u09EF\u09F2-\u09FA\u0A01-\u0A03\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A66-\u0A71\u0A75\u0A81-\u0A83\u0ABC\u0ABE-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AE2\u0AE3\u0AE6-\u0AEF\u0AF1\u0B01-\u0B03\u0B3C\u0B3E-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B62\u0B63\u0B66-\u0B70\u0B82\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD7\u0BE6-\u0BFA\u0C01-\u0C03\u0C3E-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C62\u0C63\u0C66-\u0C6F\u0C78-\u0C7F\u0C82\u0C83\u0CBC\u0CBE-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CE2\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D02\u0D03\u0D3E-\u0D44\u0D46-\u0D48\u0D4A-\u0D4D\u0D57\u0D62\u0D63\u0D66-\u0D75\u0D79\u0D82\u0D83\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DF2-\u0DF4\u0E31\u0E34-\u0E3A\u0E3F\u0E47-\u0E5B\u0EB1\u0EB4-\u0EB9\u0EBB\u0EBC\u0EC8-\u0ECD\u0ED0-\u0ED9\u0F01-\u0F3F\u0F71-\u0F87\u0F90-\u0F97\u0F99-\u0FBC\u0FBE-\u0FCC\u0FCE-\u0FD4\u102B-\u103E\u1040-\u104F\u1056-\u1059\u105E-\u1060\u1062-\u1064\u1067-\u106D\u1071-\u1074\u1082-\u108D\u108F-\u1099\u109E\u109F\u10FB\u135F-\u137C\u1390-\u1399\u166D\u166E\u1680\u169B\u169C\u16EB-\u16F0\u1712-\u1714\u1732-\u1736\u1752\u1753\u1772\u1773\u17B4-\u17D6\u17D8-\u17DB\u17DD\u17E0-\u17E9\u17F0-\u17F9\u1800-\u180E\u1810-\u1819\u18A9\u1920-\u192B\u1930-\u193B\u1940\u1944-\u194F\u19B0-\u19C0\u19C8\u19C9\u19D0-\u19D9\u19DE-\u19FF\u1A17-\u1A1B\u1A1E\u1A1F\u1B00-\u1B04\u1B34-\u1B44\u1B50-\u1B7C\u1B80-\u1B82\u1BA1-\u1BAA\u1BB0-\u1BB9\u1C24-\u1C37\u1C3B-\u1C49\u1C50-\u1C59\u1C7E\u1C7F\u1DC0-\u1DE6\u1DFE\u1DFF\u1FBD\u1FBF-\u1FC1\u1FCD-\u1FCF\u1FDD-\u1FDF\u1FED-\u1FEF\u1FFD\u1FFE\u2000-\u2064\u206A-\u2070\u2074-\u207E\u2080-\u208E\u20A0-\u20B5\u20D0-\u20F0\u2100\u2101\u2103-\u2106\u2108\u2109\u2114\u2116-\u2118\u211E-\u2123\u2125\u2127\u2129\u212E\u213A\u213B\u2140-\u2144\u214A-\u214D\u214F\u2153-\u2182\u2185-\u2188\u2190-\u23E7\u2400-\u2426\u2440-\u244A\u2460-\u269D\u26A0-\u26BC\u26C0-\u26C3\u2701-\u2704\u2706-\u2709\u270C-\u2727\u2729-\u274B\u274D\u274F-\u2752\u2756\u2758-\u275E\u2761-\u2794\u2798-\u27AF\u27B1-\u27BE\u27C0-\u27CA\u27CC\u27D0-\u2B4C\u2B50-\u2B54\u2CE5-\u2CEA\u2CF9-\u2CFF\u2DE0-\u2E2E\u2E30\u2E80-\u2E99\u2E9B-\u2EF3\u2F00-\u2FD5\u2FF0-\u2FFB\u3000-\u3004\u3007-\u3030\u3036-\u303A\u303D-\u303F\u3099-\u309C\u30A0\u30FB\u3190-\u319F\u31C0-\u31E3\u3200-\u321E\u3220-\u3243\u3250-\u32FE\u3300-\u33FF\u4DC0-\u4DFF\uA490-\uA4C6\uA60D-\uA60F\uA620-\uA629\uA66F-\uA673\uA67C-\uA67E\uA700-\uA716\uA720\uA721\uA789\uA78A\uA802\uA806\uA80B\uA823-\uA82B\uA874-\uA877\uA880\uA881\uA8B4-\uA8C4\uA8CE-\uA8D9\uA900-\uA909\uA926-\uA92F\uA947-\uA953\uA95F\uAA29-\uAA36\uAA43\uAA4C\uAA4D\uAA50-\uAA59\uAA5C-\uAA5F\uD800\uDB7F\uDB80\uDBFF\uDC00\uDFFF\uE000\uF8FF\uFB1E\uFB29\uFD3E\uFD3F\uFDFC\uFDFD\uFE00-\uFE19\uFE20-\uFE26\uFE30-\uFE52\uFE54-\uFE66\uFE68-\uFE6B\uFEFF\uFF01-\uFF20\uFF3B-\uFF40\uFF5B-\uFF65\uFFE0-\uFFE6\uFFE8-\uFFEE\uFFF9-\uFFFD])/,
+
+ tokenize: function (args) {
+ // Split on non-word characters.
+ for (var type in args) {
+ args[type] = $.grep(
+ args[type].split($.wordDiff.nonWord),
+ function (s) { return s.length; }
+ );
+ }
+
+ // Calculate the indexes and offsets for common suffixes and prefixes.
+ var i = -1, j = args.del.length, k = args.ins.length;
+ while (args.del[++i] === args.ins[i] && i <= j);
+ while (j >= i && k >= i && args.del[--j] === args.ins[--k]);
+
+ args.prefix = args.del.slice(0, i).join('');
+ args.suffix = args.del.slice(j + 1).join('');
+ args.del = args.del.slice(i, ++j);
+ args.ins = args.ins.slice(i, ++k);
+ },
+
+ lcs: function (args) {
+ var matrix = [];
+
+ for (var i = 0; i < args.del.length; i++) {
+ matrix[i] = [];
+ for (var j = 0; j < args.ins.length; j++) {
+ if (args.del[i] === args.ins[j]) {
+ matrix[i][j] = (matrix[i - 1] && matrix[i - 1][j - 1] || 0) + args.del[i].length;
+ }
+ else {
+ matrix[i][j] = Math.max(matrix[i][j - 1] || 0, matrix[i - 1] && matrix[i - 1][j] || 0);
+ }
+ }
+ }
+
+ return matrix;
+ },
+
+ changeset: function (args, matrix) {
+ var result = {};
+
+ $.each(['del', 'ins'], function () {
+ result[this] = $.map(args[this], function (a) { return new Fragment(a); });
+ });
+
+ // Backtrack through the matrix.
+ for (var i = result.del.length - 1, j = result.ins.length - 1; i >= 0; i--, j--) {
+ if (j < 0 || result.del[i].content !== result.ins[j].content) {
+ if (j < 0 || (j > 0 && matrix[i - 1] && (matrix[i][j - 1] < matrix[i - 1][j]))) {
+ j++;
+ }
+ else {
+ i++;
+ }
+ }
+ else {
+ result.del[i] = result.ins[j];
+ result.del[i].equiv = true;
+ }
+ }
+
+ // Fill up gaps.
+ for (var i = 0; i < result.del.length; i++) {
+ if (result.del[i].equiv && result.del[i].content.length < 3) {
+ var j = result.ins.indexOf(result.del[i]);
+ if (result.del[i-1] && result.del[i+1] && result.ins[j-1] && result.ins[j+1] && !result.del[i-1].equiv && !result.del[i+1].equiv && !result.ins[j-1].equiv && !result.ins[j+1].equiv){
+ result.del[i].equiv = false;
+ result.ins[j] = $.extend(true, {}, result.del[i]);
+ }
+ }
+ }
+
+ $.each(['del', 'ins'], function () {
+ // Try to move changes to the end.
+ for (var i = 0; i < result[this].length; i++)
+ moveToEnd(result[this][i], i, result[this]);
+
+ // Aggregate subsequent changes to minimize ins/del tags.
+ for (var i = 0; i < result[this].length; i++)
+ aggregate(result[this][i], i, result[this]);
+ });
+
+ return result;
+ },
+
+ render: function (args, result) {
+ var diff = {
+ del: args.prefix + join(result.del, 'del') + args.suffix,
+ ins: args.prefix + join(result.ins, 'ins') + args.suffix
+ };
+
+ return diff;
+ },
+
+ diff: function (del, ins) {
+ var args = { 'del': del, 'ins': ins };
+
+ $.wordDiff.tokenize(args);
+ var matrix = $.wordDiff.lcs(args);
+ var result = $.wordDiff.changeset(args, matrix);
+ return $.wordDiff.render(args, result);
+ }
+ };
+
+ $.fn.worddiff = function (selector, processor) {
+ var src = $(selector), del = src.data('worddiff:original');
+ if (del === undefined)
+ src.data('worddiff:original', del = src.html());
+
+ return this.each(function () {
+ var dst = $(this), ins = dst.data('worddiff:original');
+ if (ins === undefined)
+ dst.data('worddiff:original', ins = dst.html());
+
+ var diff = $.wordDiff.diff(del, ins);
+ if (processor) {
+ diff.del = processor(diff.del);
+ diff.ins = processor(diff.ins);
+ }
+
+ if (diff.del && diff.ins) {
+ src.html(diff.del).addClass('worddiff-del');
+ dst.html(diff.ins).addClass('worddiff-ins');
+ }
+ });
+ };
+
+ $.fn.worddiffRevert = function () {
+ return this.each(function () {
+ var dest = $(this), orig = dest.data('worddiff:markup');
+ if (orig === undefined) {
+ orig = dest.data('worddiff:original');
+ }
+ if (orig !== undefined) {
+ dest
+ .html(orig)
+ .removeClass('worddiff-del').removeClass('worddiff-ins');
+ }
+ });
+ };
+})(jQ13);
\ No newline at end of file
diff --git l10n_community/jquery13.js l10n_community/jquery13.js
new file mode 100644
index 0000000..e8a7732
--- /dev/null
+++ l10n_community/jquery13.js
@@ -0,0 +1,23 @@
+// $Id: jquery.js,v 1.17 2009-06-30 03:35:11 webchick Exp $
+/*jsl:ignore*/
+/*
+ * jQuery JavaScript Library v1.3.2
+ * http://jquery.com/
+ *
+ * Copyright (c) 2009 John Resig
+ * Dual licensed under the MIT and GPL licenses.
+ * http://docs.jquery.com/License
+ *
+ * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
+ * Revision: 6246
+ */
+(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F","
"]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E'. $permission_help .'
') : ''; } @@ -894,6 +872,19 @@ function l10n_community_get_languages($key = NULL) { } /** + * Returns a language object for a specific language. + * + * @param $langcode + * Language code, for example 'hu', 'pt-br', 'de' or 'it'. + * @return + * A populated language object. + */ +function l10n_community_get_language($langcode) { + $languages = l10n_community_get_languages(); + return $languages[$langcode]; +} + +/** * Get translation permission level for a specific user. * * @@ -902,45 +893,49 @@ function l10n_community_get_languages($key = NULL) { * @param $account * Optional user account. * @return - * L10N_PERM_NONE, L10N_PERM_SUGGEST or L10N_PERM_ALL + * A bitmask of various permission flags. */ -function l10n_community_get_permission($langcode, $account = NULL) { +function l10n_community_get_permission($langcode, $account = NULL, $check = NULL) { static $permissions = array(); global $user; if (empty($langcode)) { - return L10N_PERM_NONE; + return L10N_PERMISSION_NONE; } if (!isset($account)) { $account = $user; } - if (isset($permissions[$account->uid][$langcode])) { - // Return cached value if available. - return $permissions[$account->uid][$langcode]; + if (!isset($permissions[$account->uid])) { + $permissions[$account->uid] = array(); } + if (!isset($permissions[$account->uid][$langcode])) { + // Minimal permission. + $global = L10N_PERMISSION_NONE; + $global |= user_access("access localization community", $account) ? L10N_PERMISSION_VIEW : 0; + $global |= user_access("export gettext templates and translations", $account) ? L10N_PERMISSION_EXPORT : 0; + $global |= user_access("submit translation suggestions", $account) ? L10N_PERMISSION_SUGGEST : 0; + $global |= user_access("moderate other people's suggestions", $account) ? L10N_PERMISSION_MODERATE_OTHERS : 0; + $global |= user_access("moderate own suggestions", $account) ? L10N_PERMISSION_MODERATE_OWN : 0; + $global |= user_access("mark other people's translations as stable", $account) ? L10N_PERMISSION_STABILIZE_OTHERS : 0; + $global |= user_access("mark own translations as stable", $account) ? L10N_PERMISSION_STABILIZE_OWN : 0; + $global |= user_access("import gettext files", $account) ? L10N_PERMISSION_IMPORT : 0; - // Initialize to lowest possible permission. - $permissions[$account->uid][$langcode] = L10N_PERM_NONE; - - if ($account->uid == 1) { - // The administrator has all permissions in all languages. - return ($permissions[$account->uid][$langcode] = L10N_PERM_ALL); + if (!module_exists('l10n_groups')) { + $permissions[$account->uid][$langcode] = $global; + } + else { + l10n_groups_get_permission($permissions, $account, $global); + } } - $global_permission = user_access('submit translations and approve suggestions', $account) ? L10N_PERM_ALL : (user_access('submit suggestions', $account) ? L10N_PERM_SUGGEST : L10N_PERM_NONE); - - if (($global_permission != L10N_PERM_NONE) && module_exists('l10n_groups')) { - // Fill up permission information for this account if it has any permission. - l10n_groups_get_permission($permissions, $global_permission, $langcode, $account); + if (isset($check)) { + return !(~$permissions[$account->uid][$langcode] & ($check | L10N_PERMISSION_VIEW)); } else { - // Remember global permission if using l10n_community standalone. - $permissions[$account->uid][$langcode] = $global_permission; + // Return from local cache. + return $permissions[$account->uid][$langcode]; } - - // Return from local cache. - return $permissions[$account->uid][$langcode]; } /** @@ -1150,32 +1145,23 @@ function l10n_community_trim($translation, $source) { return $matches[1] . trim($translation) . $matches[2]; } -/** - * Set a message based on the number of translations changed. - * - * Used by both the save and import process. - */ -function l10n_community_update_message($inserted, $updated, $unchanged, $suggested, $duplicates) { - // Inform user about changes made. - $message = array(); - if ($inserted) { - $message[] = format_plural($inserted, '1 new translation added', '@count new translations added'); - } - if ($suggested) { - $message[] = format_plural($suggested, '1 new suggestion added', '@count new suggestions added'); - } - if ($updated) { +function l10n_community_update_message($declined, $approved, $inserted, $updated = 0, $unchanged = 0, $suggested = 0) { + $messages = array(); + if ($declined) + $messages[] = format_plural($declined, '1 translation declined', '@count translations declined'); + if ($approved) + $messages[] = format_plural($approved, '1 translation approved', '@count translations approved'); + if ($inserted) + $messages[] = format_plural($inserted, '1 translation added', '@count translations added'); + if ($updated) $message[] = format_plural($updated, '1 translation updated', '@count translations updated'); - } - if ($unchanged) { + if ($unchanged) $message[] = format_plural($unchanged, '1 translation unchanged', '@count translations unchanged'); - } - if ($duplicates) { - $message[] = format_plural($duplicates, '1 duplicate translation not saved', '@count duplicate translations not saved'); - } - if (count($message)) { - drupal_set_message(join(', ', $message) .'.'); - } + if ($suggested) + $message[] = format_plural($suggested, '1 new suggestion added', '@count new suggestions added'); + + if ($messages) + drupal_set_message(implode(', ', $messages)); } /** @@ -1236,14 +1222,6 @@ function l10n_community_project_uri_by_title($title) { return db_result(db_query("SELECT uri FROM {l10n_community_project} WHERE title = '%s'", $title)); } -/** - * Check whether $suggestion is duplicate for $sid in $langcode. - */ -function l10n_community_is_duplicate($suggestion, $sid, $langcode) { - // Use BINARY matching to avoid marking case-corrections as duplicate. - return (bool) db_result(db_query("SELECT s.sid FROM {l10n_community_string} s LEFT JOIN {l10n_community_translation} t ON s.sid = t.sid WHERE t.translation = BINARY '%s' AND t.is_active = 1 AND t.language = '%s' AND s.sid = %d", $suggestion, $langcode, $sid)); -} - // = Theme functions =========================================================== /** @@ -1251,16 +1229,6 @@ function l10n_community_is_duplicate($suggestion, $sid, $langcode) { */ function l10n_community_theme($existing, $type, $theme, $path) { return array( - // l10n_community.module - 'l10n_community_button' => array( - 'arguments' => array('type' => NULL, 'class' => NULL, 'extras' => ''), - ), - 'l10n_community_strings' => array( - 'arguments' => array('items' => NULL, 'form' => TRUE), - ), - 'l10n_community_copy_button' => array( - 'arguments' => array(), - ), // pages.inc 'l10n_community_progress_columns' => array( 'arguments' => array('sum' => NULL, 'translated' => NULL, 'has_suggestion' => NULL), @@ -1275,11 +1243,20 @@ function l10n_community_theme($existing, $type, $theme, $path) { 'l10n_community_filter_form' => array( 'arguments' => array('form' => NULL), ), - 'l10n_community_translate_form' => array( - 'arguments' => array('form' => NULL), + 'l10n_community_translate_translation' => array( + 'arguments' => array('element' => NULL), + ), + 'l10n_community_translate_radio' => array( + 'arguments' => array('element' => NULL), + ), + 'l10n_community_translate_source' => array( + 'arguments' => array('element' => NULL), + ), + 'l10n_community_translate_translation_list' => array( + 'arguments' => array('element' => NULL), ), - 'l10n_community_in_context' => array( - 'arguments' => array('source' => NULL), + 'l10n_community_translate_table' => array( + 'arguments' => array('element' => NULL), ), // l10n_community.admin.inc 'l10n_community_admin_projects_form' => array( @@ -1288,152 +1265,10 @@ function l10n_community_theme($existing, $type, $theme, $path) { 'l10n_community_admin_releases_form' => array( 'arguments' => array('form' => NULL), ), - // moderate.inc - 'l10n_community_moderation_form' => array( - 'arguments' => array('form' => NULL), - ), ); } /** - * Theme a textual button. - * - * Text values are centralized here so it is easy to change. - */ -function theme_l10n_community_button($type, $class, $extras = '') { - switch ($type) { - case 'translate': - $text = t('Translate'); - break; - case 'lookup': - $text = t('Information'); - break; - case 'edit': - // Source string and translation edit field. - $text = t('Edit'); - break; - case 'has-suggestion': - case 'has-no-suggestion': - case 'untranslated': - // Star in a filled circle. - $text = t('Suggestions'); - break; - case 'approve': - // Checkmark. - $text = t('Approve'); - break; - case 'decline': - // Checkmark. - $text = t('Decline'); - break; - case 'save': - // Save button. - $text = t('Save'); - break; - case 'clear': - // Clear form button. - $text = t('Clear'); - break; - } - return ' '; -} - -/** - * Theme a list of translatable strings. Adds a copy button to each string - * for quickly copying its source text into a translation form. - */ -function theme_l10n_community_strings($items, $form = TRUE) { - $output = "- ";
- foreach ($items as $i => $item) {
- $output .= "
- ";
- if ($form && ($i < 1)) {
- // Only print copy button if we are displaying a form and on the first item.
- // For plurals, only the first item will have the copy button, but will copy
- // all the values into the form.
- $output .= "";
- }
- $output .= "". $item .""; - $output .= " ";
- }
- $output .= "
', - check_plain($string) - ); - // Make all %, ! and @ marked pladeholders emphasized. - $formatted = preg_replace( - '~((%|!|@)[0-9a-zA-Z_-]+)~', - '\\1', - $formatted - ); - - if ($rich_markup) { - $class = ''; - if (isset($sid) && isset($delta)) { - $class = ' class="string-'. $sid .'-'. $delta .'"'; - } - elseif ($sid) { - $class = ' class="string-'. $sid .'"'; - } - return '
',
- '#suffix' => '
',
- );
- $form['options']['approve'] = array(
- '#type' => 'submit',
- '#value' => t('Approve all selected'),
- );
- $form['options']['decline'] = array(
- '#type' => 'submit',
- '#value' => t('Decline all selected'),
- );
-
- // All strings and suggestions
- $form['strings'] = array(
- '#tree' => TRUE,
- );
- foreach ($strings as $string) {
- $form['strings']['tid'][$string->tid] = array(
- '#type' => 'checkbox',
- );
- $form['strings']['sid'][$string->tid] = array(
- '#type' => 'value', '#value' => $string->sid,
- );
- $form['strings']['source'][$string->tid] = array(
- //'#type' => 'item',
- '#value' => l10n_community_format_string($string->source, FALSE) .' '. theme('l10n_community_in_context', $string),
- );
- $form['strings']['translation'][$string->tid] = array(
- //'#type' => 'item',
- '#value' => l10n_community_format_string($string->translation, FALSE),
- );
- $form['strings']['suggestion'][$string->tid] = array(
- //'#type' => 'item',
- '#value' => l10n_community_format_string($string->suggestion, FALSE),
- );
- }
- return $form;
-}
-
-/**
- * Moderation form submission callback.
- */
-function l10n_community_moderation_form_submit($form, &$form_state) {
- // Filter out unchecked translations.
- $translations = array_filter($form_state['values']['strings']['tid']);
- if (!empty($translations)) {
- // Use these tids to get the list of sids.
- $strings = array_intersect_key($form_state['values']['strings']['sid'], $translations);
-
- // The tids are the keys of the array.
- $tids = array_keys($translations);
- // The strings array has tid => sid.
- $sids = array_unique($strings);
- if ($form_state['values']['op'] == t('Approve all selected')) {
- l10n_community_moderate_approve_selected($form_state['values']['langcode'], $tids, $sids);
- }
- elseif ($form_state['values']['op'] == t('Decline all selected')) {
- l10n_community_moderate_decline_selected($form_state['values']['langcode'], $tids, $sids);
- }
- }
- else {
- drupal_set_message(t('No suggestions selected for operation. Please select one or more suggestions to run the operation on.'), 'error');
- }
-}
-
-
-// == API functions ============================================================
-
-/**
- * Get suggestions based on some conditions.
- *
- * @param $langcode
- * Language code, for example 'hu', 'pt-br', 'de', 'it'.
- * @param $filters
- * See l10n_community_get_strings().
- * @return
- * An array of suggestion records from database.
- */
-function l10n_community_get_suggestions($langcode, $filters) {
- $join = $join_args = $where = $where_args = array();
- $sql = $sql_count = '';
-
- $select = "SELECT DISTINCT ts.tid, ts.sid, tt.translation, ts.translation AS suggestion, s.value AS source, s.context FROM {l10n_community_translation} ts";
- $select_count = "SELECT COUNT(DISTINCT(ts.tid)) FROM {l10n_community_translation} ts";
- $join[] = "INNER JOIN {l10n_community_string} s ON ts.sid = s.sid";
- $where[] = "ts.is_suggestion = 1 AND ts.is_active = 1 AND ts.language = '%s'";
- $where_args[] = $langcode;
-
- // Add submitted by condition
- if (!empty($filters['author'])) {
- $where[] = "ts.uid_entered = %d";
- $where_args[] = $filters['author']->uid;
- }
-
- // Restrict based on project or release.
- $release = empty($filters['release']) || $filters['release'] === 'all' ? NULL : $filters['release'];
- $project = $filters['project'];
- if ($release || $project) {
- $join[] = "INNER JOIN {l10n_community_line} l ON ts.sid = l.sid";
- // If we have a release we ignore the project
- if ($release) {
- // Release restriction.
- $where_args[] = $release;
- $where[] = 'l.rid = %d';
- }
- elseif ($project) {
- $where[] = "l.pid = %d";
- $where_args[] = $project->pid;
- }
- }
-
- // Context based filtering.
- if (isset($filters['context']) && $filters['context'] != 'all') {
- // We use 'none' for no context, so '' can be the defaut (for all contexts).
- $where_args[] = $filters['context'] == 'none' ? '' : $filters['context'];
- $where[] = "s.context = '%s'";
- }
-
- // Search in the source or target (suggestion) strings.
- if (!empty($filters['search'])) {
- $where_args[] = $filters['search'];
- $where_args[] = $filters['search'];
- $where[] = "(s.value LIKE '%%%s%%' OR ts.translation LIKE '%%%s%%')";
- }
-
- // Restriction based on string status.
- if ($filters['status'] & L10N_STATUS_UNTRANSLATED) {
- $join[] = "LEFT JOIN {l10n_community_translation} tt ON tt.sid = ts.sid AND tt.is_suggestion = 0 AND tt.is_active = 1 AND tt.language = '%s'";
- $join_args[] = $langcode;
- $where[] = "(tt.tid IS NULL OR tt.translation = '')";
- }
- elseif ($filters['status'] & L10N_STATUS_TRANSLATED) {
- $join[] = "INNER JOIN {l10n_community_translation} tt ON tt.sid = ts.sid AND tt.is_suggestion = 0 AND tt.is_active = 1 AND tt.language = '%s'";
- $join_args[] = $langcode;
- }
- else {
- $join[] = "LEFT JOIN {l10n_community_translation} tt ON tt.sid = ts.sid AND tt.is_suggestion = 0 AND tt.is_active = 1 AND tt.language = '%s'";
- $join_args[] = $langcode;
- }
-
- // Build the queries
- $sql_args = array_merge($join_args, $where_args);
- $sql_where = implode(' ', $join) .' WHERE '. implode(' AND ', $where);
- $sql = $select .' '. $sql_where;
- $sql_count = $select_count .' '. $sql_where;
-
- $strings = pager_query($sql, $filters['limit'], 0, $sql_count, $sql_args);
- $result = array();
- while ($string = db_fetch_object($strings)) {
- $result[] = $string;
- }
- return $result;
-}
-
-/**
- * Mass approve callback.
- */
-function l10n_community_moderate_approve_selected($langcode, $tids, $strings) {
- global $user;
-
- // In case we have more than one sugggestion for an sid, error.
- $sids = array_unique($strings);
- if (count($sids) < count($strings)) {
- drupal_set_message(t('You cannot approve more than one suggestion per string.'), 'error');
- return;
- }
- $tid_placeholders = db_placeholders($tids);
- $sid_placeholders = db_placeholders($sids);
-
- // Mark existing translations and suggestions as inactive in this language.
- $args = array_merge($sids, array($langcode));
- db_query("UPDATE {l10n_community_translation} SET is_active = 0 WHERE sid IN ($sid_placeholders) AND language = '%s'", $args);
-
- // Remove placeholder translation record (which was there if
- // first came suggestions, before an actual translation).
- db_query("DELETE FROM {l10n_community_translation} WHERE sid IN ($sid_placeholders) AND translation = '' AND language = '%s'", $args);
-
- // Mark this exact suggestions as active, and set approval time.
- $args = array_merge(array(time(), $user->uid), $tids);
- db_query("UPDATE {l10n_community_translation} SET time_approved = %d, uid_approved = %d, has_suggestion = 0, is_suggestion = 0, is_active = 1 WHERE tid IN ($tid_placeholders)", $args);
-
- drupal_set_message(format_plural(count($tids), 'A suggestion has been approved.', '@count suggestions have been approved.'));
-}
-
-/**
- * Mass decline callback.
- */
-function l10n_community_moderate_decline_selected($langcode, $tids, $sids) {
- // We are not interested in duplicated sids.
- $sids = array_unique($sids);
- $tid_placeholders = db_placeholders($tids);
- $sid_placeholders = db_placeholders($sids);
-
- // Deactive the selected suggestions.
- db_query("UPDATE {l10n_community_translation} SET is_active = 0 WHERE tid IN ($tid_placeholders)", $tids);
- drupal_set_message(format_plural(db_affected_rows(), 'A suggestion has been declined.', '@count suggestions have been declined.'));
-
- // Update 'has suggestion' option for remaining string translations
- $args = array_merge(array($langcode), $sids);
- $result = db_query(
- "SELECT tt.tid
- FROM {l10n_community_translation} tt
- LEFT JOIN {l10n_community_translation} ts ON tt.sid = ts.sid AND tt.language = ts.language AND ts.is_active = 1 AND ts.is_suggestion = 1
- WHERE tt.is_active = 1 AND tt.is_suggestion = 0 AND tt.has_suggestion = 1 AND tt.language = '%s' AND tt.sid IN ($sid_placeholders)
- GROUP BY tt.tid
- HAVING COUNT(ts.tid) = 0",
- $args
- );
- while ($string = db_fetch_object($result)) {
- db_query("UPDATE {l10n_community_translation} SET has_suggestion = 0 WHERE tid = %d", $string->tid);
- }
-}
-
-// == Theme functions ==========================================================
-
-/**
- * Theme the approval form
- */
-function theme_l10n_community_moderation_form($form) {
- $output = '';
- $pager = isset($form['pager']) ? drupal_render($form['pager']) : '';
- $output .= $pager;
- $output .= drupal_render($form['options']);
- $header = array(theme('table_select_header_cell'), t('Suggestion'), t('Translation'), t('Source'));
- foreach (element_children($form['strings']['tid']) as $tid) {
- $rows[] = array(
- drupal_render($form['strings']['tid'][$tid]),
- drupal_render($form['strings']['suggestion'][$tid]),
- drupal_render($form['strings']['translation'][$tid]),
- array('class' => 'source', 'data' => drupal_render($form['strings']['source'][$tid])),
- );
- }
- $output .= theme('table', $header, $rows);
- $output .= $pager;
- $output .= drupal_render($form);
- return $output;
-}
diff --git l10n_community/translate.inc l10n_community/translate.inc
index 54f4d37..373f165 100644
--- l10n_community/translate.inc
+++ l10n_community/translate.inc
@@ -6,51 +6,6 @@
* Translation view and editing pages for localization community.
*/
-// = Translation interface hub =================================================
-
-/**
- * Menu callback for the translation pages.
- *
- * Displays a translation view or translation edit page depending
- * on permissions. If no strings are found, an error is printed.
- *
- * @param $langcode
- * Language code, for example 'hu', 'pt-br', 'de', 'it'.
- */
-function l10n_community_translate_page($langcode = NULL, $mode = 'view') {
-
- // Add missing breadcrumb.
- drupal_set_breadcrumb(
- array(
- l(t('Home'), NULL),
- l(t('Translate'), 'translate')
- )
- );
-
- $languages = l10n_community_get_languages();
- $perm = l10n_community_get_permission($langcode);
-
- $filters = l10n_community_build_filter_values($_GET);
- $output = drupal_get_form('l10n_community_filter_form', $filters);
-
- $strings = l10n_community_get_strings($languages[$langcode]->language, $filters, $filters['limit']);
- if (!count($strings)) {
- drupal_set_message(t('No strings found with this filter. Try adjusting the filter options.'));
- }
- elseif ($perm == L10N_PERM_NONE || $mode == 'view') {
- // For users without permission to translate or suggest, display the view.
- drupal_set_title(t('@language translations', array('@language' => $languages[$langcode]->name)));
- $output .= l10n_community_translate_view($strings, $languages[$langcode], $filters);
- }
- else {
- // For users with some permission, display the form.
- drupal_add_js(drupal_get_path('module', 'l10n_community') .'/l10n_community.js');
- drupal_set_title(t('Translate to @language', array('@language' => $languages[$langcode]->name)));
- $output .= drupal_get_form('l10n_community_translate_form', $strings, $languages[$langcode], $filters, $perm);
- }
- return $output;
-}
-
// = Filter form handling ======================================================
/**
@@ -197,391 +152,546 @@ function l10n_community_filter_form_submit($form, &$form_state) {
}
}
-// = Translation viewer ========================================================
-
/**
- * Form for translations display.
- *
- * @param $strings
- * Array of string objects to display on the page.
- * @param $language
- * Language object corresponding to the page displayed.
- * @param $filters
- * Filters used to present this listing view.
+ * Theme function for l10n_community_filter_form.
*/
-function l10n_community_translate_view($strings = array(), $language = NULL, $filters = array()) {
- $output = '';
- $rows = array();
- foreach ($strings as $string) {
- $row = array();
- // Source display
- $source = l10n_community_format_string($string->value);
- $source .= theme('l10n_community_in_context', $string);
- $row[] = array('data' => $source, 'class' => 'source');
-
- // Translation display.
- if (!empty($string->translation)) {
- if (strpos(chr(0), $string->value) !== FALSE) {
- $translations = explode(chr(0), l10n_community_format_text($string->translation));
- // Fill in any missing items, so it is shown that not all items are done.
- if (count($translations) < $language->plurals) {
- $translations = array_merge($translations, array_fill(0, count($translations) - $language->plurals, ''));
- }
- $translation = theme('item_list', $translations);
- }
- else {
- $translation = l10n_community_format_text($string->translation);
- }
- $row[] = $translation;
- }
- else {
- $row[] = '';
+function theme_l10n_community_filter_form($form) {
+ $row = array();
+ $labels = array();
+ // Only display these elements in distinct table cells
+ $elements = array('project', 'release', 'context', 'status', 'author', 'search', 'limit');
+ foreach ($form as $id => &$element) {
+ if (in_array($id, $elements)) {
+ $labels[] = $element['#title'];
+ unset($element['#title']);
+ $row[] = drupal_render($element);
}
- $rows[] = $row;
}
- $output .= ($pager = theme('pager', NULL, $filters['limit'], 0));
- $output .= theme('table', array(t('Source Text'), t('Translations')), $rows, array('class' => 'l10n-server-translate'));
- $output .= $pager;
- $output = "". $output ."
";
- return $output;
+ // Fill in the rest of the header above the buttons.
+ $labels[] = '';
+ // Display the rest of the form in the last cell
+ $row[] = array('data' => drupal_render($form), 'class' => 'last');
+ return theme('table', $labels, array($row), array('class' => 'l10n-server-filter'));
}
-// = Translation editor ========================================================
+// = Translation view ==========================================================
+
+/**
+ * Menu callback: List translations and suggestions
+ */
+function l10n_community_translate_page($langcode) {
+ drupal_add_css(drupal_get_path('module', 'l10n_community') .'/editor.css');
+ drupal_add_js(drupal_get_path('module', 'l10n_community') .'/jquery13.js');
+ drupal_add_js(drupal_get_path('module', 'l10n_community') .'/jquery.worddiff.js');
+ drupal_add_js(drupal_get_path('module', 'l10n_community') .'/editor.js');
+
+ $language = l10n_community_get_language($langcode);
+ $filters = l10n_community_build_filter_values($_GET);
+ $strings = l10n_community_get_strings($language->language, $filters, $filters['limit']);
+
+ $output = drupal_get_form('l10n_community_filter_form', $filters);
+
+ if (!count($strings)) {
+ drupal_set_message(t('No strings found with this filter. Try adjusting the filter options.'));
+ }
+ else {
+ $output .= drupal_get_form('l10n_community_translate_form', $language, $filters, $strings);
+ }
+
+ return $output;
+}
/**
- * Translation web interface.
+ * Form callback: List translations and suggestions.
*
- * @param $strings
- * Array of string objects to display.
+ * @param $form_state
+ * The form state array.
* @param $language
- * Language object.
+ * A language object.
* @param $filters
- * Filters used to present this editing view.
- * @param $perm
- * Community permission level of user watching the page.
+ * An array of filters applied to the strings.
+ * @param $strings
+ * The strings to render.
*/
-function l10n_community_translate_form(&$form_state, $strings = array(), $language = NULL, $filters = array(), $perm = L10N_PERM_SUGGEST) {
+function l10n_community_translate_form(&$form_state, $language, $filters, $strings) {
+ $permission = l10n_community_get_permission($language->language);
+ $pager = theme('pager', NULL, $filters['limit'], 0);
+ $redirect_url = $_GET;
+ unset($redirect_url['q']);
- if (isset($_GET['page'])) {
- // Ensure that we keep all filter values, even the page number, so
- // after submission, the same page can be shown.
- $filters['page'] = (int) $_GET['page'];
+ $form = array(
+ '#submit' => array('l10n_community_translate_submit'),
+ '#redirect' => array($_GET['q'], $redirect_url),
+ 'langcode' => array('#type' => 'value', '#value' => $language->language),
+ 'pager_top' => array('#weight' => -10, '#value' => $pager),
+ 'submit_top' => array('#type' => 'submit', '#value' => t('Save changes'), '#access' => $permission !== L10N_PERMISSION_VIEW),
+ 'strings' => array('#tree' => TRUE, '#theme' => 'l10n_community_translate_table'),
+ 'submit' => array('#type' => 'submit', '#value' => t('Save changes'), '#access' => $permission !== L10N_PERMISSION_VIEW),
+ 'pager_bottom' => array('#weight' => 10, '#value' => $pager),
+ );
+
+ foreach ($strings as $string) {
+ $form['strings'][$string->sid] = _l10n_community_translate_string($form_state, $string, $language, $permission);
}
- // Replace some values by their string representation for URL redirects.
- foreach (array('project' => 'uri', 'author' => 'name') as $name => $key) {
- if (!empty($filters[$name])) {
- $filters[$name] = $filters[$name]->$key;
- }
+
+ return $form;
+}
+
+/**
+ * Return a marked-up string.
+ */
+function _l10n_community_translate_render_string($strings, $empty = '') {
+ if ($empty) {
+ $empty = ' data-empty="'. check_plain($empty) .'"';
+ }
+ return "$toolbox
";
- $form[$string->sid]['toolbox'] = array(
- '#type' => 'markup',
- '#value' => $toolbox,
- );
- $form[$string->sid]['messagebox'] = array(
- '#type' => 'markup',
- '#value' => "",
- );
+ // If the user may add new suggestions, display a textarea.
+ if ($permission & L10N_PERMISSION_SUGGEST) {
+ $textarea = _l10n_community_translate_translation_textarea($source, $language);
+ $form[$textarea->tid] = _l10n_community_translate_translation($form_state, $textarea, $permission, $source);
+ }
- $is_plural = strpos($string->value, "\0");
- // Multiple source strings if we deal with plurals. The form item and
- // consequently the JavaScript strings identifiers are the sid and then
- // the index of the plural being displayed.
- $string_parts = explode(chr(0), $string->value);
- foreach ($string_parts as $delta => &$part) {
- $part = l10n_community_format_text($part, $string->sid, (count($string_parts) > 1) ? $delta : NULL);
- }
- $source = theme('l10n_community_strings', $string_parts);
- $source .= theme('l10n_community_in_context', $string);
+ return $form;
+}
- $form[$string->sid]['source'] = array(
- '#type' => 'item',
- '#value' => $source,
- );
+// Build mock object for new textarea
+function _l10n_community_translate_translation_textarea($source, $language) {
+ global $user;
- $translated = !empty($string->translation);
- $form[$string->sid]['translation'] = array(
- '#type' => 'item',
- // Hide editing controls of translated stuff to save some space and guide user eyes.
- '#prefix' => '',
- '#suffix' => '
',
- );
+ return (object)array(
+ 'sid' => $source->sid,
+ 'tid' => 'new',
+ 'translation' => array_fill(0, count($source->value), ''),
+ 'is_active' => '1',
+ 'is_suggestion' => '1',
+ 'uid_entered' => $user->uid,
+ );
+}
- if ($is_plural) {
- // Dealing with a string with plural versions.
- if ($translated) {
- // Add translation form element with all plural versions.
- $translations = explode("\0", $string->translation);
- $string_parts = array();
- for ($i = 0; $i < $language->plurals; $i++) {
- $target = $string->sid .'-'. $i;
- $string_parts[] = l10n_community_format_text($translations[$i], $string->sid, $i);
- }
- $form[$string->sid]['translation_existing'] = array(
- '#type' => 'item',
- '#value' => theme('l10n_community_strings', $string_parts),
+function _l10n_community_translate_translation(&$form_state, $string, $permission, $source) {
+ global $user;
+ $is_own = $user->uid == $string->uid_entered;
+ $is_active = $string->is_active && !$string->is_suggestion;
+ $is_new = $string->tid == 'new';
+ $may_moderate = $permission & ($is_own ? L10N_PERMISSION_MODERATE_OWN : L10N_PERMISSION_MODERATE_OTHERS);
+ $may_stabilize = $permission & ($is_own ? L10N_PERMISSION_STABILIZE_OWN : L10N_PERMISSION_STABILIZE_OTHERS);
+
+ $form = array(
+ '#theme' => 'l10n_community_translate_translation',
+ 'original' => array('#type' => 'value', '#value' => $string),
+ );
+
+ $form['active'] = array(
+ '#type' => 'radio',
+ '#theme' => 'l10n_community_translate_radio',
+ '#title' => _l10n_community_translate_render_string($string->translation, $is_new ? t('(empty)') : FALSE),
+ '#return_value' => $string->tid,
+ '#default_value' => $is_active ? $string->tid : NULL,
+ '#parents' => array('strings', $string->sid, 'active'),
+ '#disabled' => !$may_moderate && !$is_active,
+ '#attributes' => array('class' => 'selector'),
+ );
+
+ if ($string->tid) {
+ if ($may_moderate && $string->tid != 'new') {
+ $form['declined'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Declined'),
+ '#default_value' => !($string->is_active || $string->is_suggestion),
+ );
+ }
+ // if ($may_stabilize) {
+ // $form['stable'] = array(
+ // '#type' => 'checkbox',
+ // '#title' => t('Stable'),
+ // '#default_value' => FALSE, // $string->is_stable,
+ // );
+ // }
+ if ($string->tid == 'new') {
+ $form['value'] = array_fill(0, count($source->value), array(
+ '#type' => 'textarea',
+ '#cols' => 60,
+ '#rows' => 3,
+ '#default_value' => t(''. t('approved by !author on @date', array( + '!author' => theme('username', (object)array('name' => $string->username_approved, 'uid' => $string->uid_approved)), + '@date' => format_date($string->time_approved), + '@ago' => t('@time ago', array('@time' => format_interval($now - $string->time_approved))), + )); } - // Include editing area for each plural variant. - $form[$string->sid]['translation']['value'][$i] = array( - // Use textarea for long and multiline strings. - '#type' => ((strlen($string_parts[$i]) > 45) || (count(explode("\n", $string_parts[$i])) > 1)) ? 'textarea' : 'textfield', - '#description' => $description, - '#rows' => 1, - '#id' => 'l10n-community-translation-'. $target, + $form['author'] = array( + '#value' => $title, ); } } + } - // Dealing with a simple string (no plurals). + return $form; +} - else { - if ($translated) { - $form[$string->sid]['translation_existing'] = array( - '#type' => 'item', - '#value' => theme('l10n_community_strings', array(l10n_community_format_text($string->translation, $string->sid))), - ); - } - $form[$string->sid]['translation']['value'] = array( - // Use textarea for long and multiline strings. - '#type' => ((strlen($string->value) > 45) || (count(explode("\n", $string->value)) > 1)) ? 'textarea' : 'textfield', - // Provide accurate title based on previous data and permission. - '#description' => $translated ? (($perm == L10N_PERM_SUGGEST) ? t('Add a new suggestion') : t('Add a new translation')) : (($perm == L10N_PERM_SUGGEST) ? t('Suggestion') : ''), - '#rows' => 4, - '#resizable' => FALSE, - '#cols' => NULL, - '#size' => NULL, - '#id' => 'l10n-community-translation-'. $string->sid, - ); - if (strlen($string->value) > 200) { - $form[$string->sid]['translation']['value']['#rows'] = floor(strlen($string->value) * .03); - $form[$string->sid]['translation']['value']['#resizable'] = TRUE; + +function theme_l10n_community_translate_translation($element) { + if (!isset($element['#attributes']['class'])) { + $element['#attributes']['class'] = ''; + } + $element['#attributes']['class'] .= ' clearfix translation'; + + switch ($element['active']['#return_value']) { + case 'new': + $element['#attributes']['class'] .= ' new-translation'; + break; + case '0': + $element['#attributes']['class'] .= ' no-translation'; + // Fallthrough. + default: + if ($element['active']['#value'] !== '') { + $element['#attributes']['class'] .= ' is-active default'; } - } + } - // Add AJAX saving buttons - $form[$string->sid]['translation']['save'] = array( - '#prefix' => "", - '#value' => theme('l10n_community_button', 'clear', 'l10n-clear'), - '#type' => 'markup', - ); + $output = '
- '. $actions .'
- ';
+ foreach (element_children($element) as $child) {
+ if (is_numeric($child) || $child == 'new') {
+ $output .= drupal_render($element[$child]);
}
+ }
+ $output .= '
";
- $translation_pane .= drupal_render($element['toolbox']);
- $translation_pane .= "
";
- $row = array(
- array(
- 'data' => $source_pane,
- 'class' => 'source',
- 'id' => 'spane-'. $id,
- ),
- array(
- 'data' => $translation_pane,
- 'class' => 'translation',
- 'id' => 'tpane-'. $id,
- ),
- );
- $rows[] = $row;
- unset($form[$id]);
- }
+ // Load source string and adjust translation whitespace based on source.
+ $source_string = db_result(db_query('SELECT value FROM {l10n_community_string} WHERE sid = %d', $sid));
+ $translation = l10n_community_pack_string($translation);
+ $translation = l10n_community_trim($translation, $source_string);
+
+ // Don't store empty translations.
+ if ($translation === '') {
+ return NULL;
}
- $output .= drupal_render($form['pager_top']);
- $output .= theme('table', array(t('Source Text'), t('Translations')), $rows, array('class' => 'l10n-server-translate'));
- $output .= drupal_render($form);
- return $output;
+
+ // Look for an existing active translation, if any.
+ $existing = db_fetch_object(db_query("SELECT tid FROM {l10n_community_translation} WHERE sid = %d AND language = '%s' AND translation = '%s'", $sid, $langcode, $translation));
+ if (!empty($existing)) {
+ // The translation is already in the db. Make it an active suggestion again.
+ db_query("UPDATE {l10n_community_translation} SET is_suggestion = 1, is_active = 1 WHERE tid = %d", $existing->tid);
+ $tid = $existing->tid;
+ }
+ else {
+ // This is a new translation.
+ l10n_community_mock_translation($langcode, $sid);
+ // Insert the new suggestion.
+ db_query("INSERT INTO {l10n_community_translation} (sid, translation, language, uid_entered, time_entered, is_suggestion, is_active) VALUES (%d, '%s', '%s', %d, %d, 1, 1)", $sid, $translation, $langcode, $user->uid, time());
+ $tid = db_last_insert_id('l10n_community_translation', 'tid');
+ }
+
+ // Mark the existing or mock translation has having suggestions.
+ l10n_community_update_suggestion_status($langcode, $sid);
+
+ return $tid;
+}
+
+/**
+ * Marks a translation as declined.
+ *
+ * @param $langcode
+ * The language of the declined translation.
+ * @param $sid
+ * The string ID the translation belongs to.
+ * @param $tid
+ * The translation ID of the translation.
+ */
+function l10n_community_decline_string($langcode, $sid, $tid) {
+ // Mark this translation as inactive.
+ db_query("UPDATE {l10n_community_translation} SET is_suggestion = 0, is_active = 0 WHERE tid = %d", $tid);
+
+ // Make sure the mock translation is there in case we declined the active translation.
+ l10n_community_mock_translation($langcode, $sid);
+ l10n_community_update_suggestion_status($langcode, $sid);
}
/**
+ * Updates the has_suggestion flag for the active translation.
+ *
+ * @param $langcode
+ * The language of the string.
+ * @param $sid
+ * The string ID that should be updated.
+ */
+function l10n_community_update_suggestion_status($langcode, $sid) {
+ // Let's see if we have any suggestions remaining in this language.
+ $count = db_result(db_query("SELECT COUNT(*) FROM {l10n_community_translation}
+ WHERE sid = %d AND is_suggestion = 1 AND is_active = 1 AND language = '%s'", $sid, $langcode));
+
+ // Update the status according to the number of suggestions.
+ db_query("UPDATE {l10n_community_translation} SET has_suggestion = %d
+ WHERE sid = %d AND is_suggestion = 0 AND is_active = 1 AND language = '%s'", $count ? 1 : 0, $sid, $langcode);
+}
+
+/**
+ * Marks a translation as approve.
+ *
+ * @param $langcode
+ * The language of the approved translation.
+ * @param $sid
+ * The string ID the translation belongs to.
+ * @param $tid
+ * The translation ID of the translation.
+ */
+function l10n_community_approve_string($langcode, $sid, $tid) {
+ global $user;
+
+ // Remove placeholder translation record (which was there if
+ // first came suggestions, before an actual translation).
+ db_query("DELETE FROM {l10n_community_translation} WHERE sid = %d AND translation = '' AND language = '%s'", $sid, $langcode);
+
+ // Make the existing approved string a suggestion.
+ db_query("UPDATE {l10n_community_translation} SET is_suggestion = 1 WHERE sid = %d AND language = '%s' AND is_suggestion = 0 AND is_active = 1", $sid, $langcode);
+
+ // Mark this exact suggestion as active, and set approval time.
+ db_query("UPDATE {l10n_community_translation} SET time_approved = %d, uid_approved = %d, is_suggestion = 0, is_active = 1 WHERE tid = %d;", time(), $user->uid, $tid);
+ l10n_community_update_suggestion_status($langcode, $sid);
+}
+
+/**
+ * Unpacks a string as retrieved from the database.
+ *
+ * @param $string
+ * The string with separation markers (NULL byte)
+ * @return
+ * An array of strings with one element for each plural form in case of
+ * a plural string, or one element in case of a regular string.
+ */
+function l10n_community_unpack_string($string) {
+ return explode("\0", $string);
+}
+
+/**
+ * Packs a string for storage in the database.
+ *
+ * @param $string
+ * An array of strings.
+ * @return
+ * A packed string with NULL bytes separating each string.
+ */
+function l10n_community_pack_string($strings) {
+ return implode("\0", $strings);
+}
+
+// = Miscellaneous =============================================================
+
+/**
* Theme context information for source strings.
*
* @param $string
@@ -626,10 +736,12 @@ function l10n_community_get_strings($langcode, $filters, $pager = NULL) {
$join = $join_args = $where = $where_args = array();
$sql = $sql_count = '';
- $select = "SELECT DISTINCT s.sid, s.value, s.context, t.tid, t.language, t.translation, t.uid_entered, t.uid_approved, t.time_entered, t.time_approved, t.has_suggestion, t.is_suggestion, t.is_active FROM {l10n_community_string} s";
+ $select = "SELECT DISTINCT s.sid, s.value, s.context, t.tid, t.language, t.translation, t.uid_entered, t.uid_approved, t.time_entered, t.time_approved, t.has_suggestion, t.is_suggestion, t.is_active, u.name as username, u2.name as username_approved FROM {l10n_community_string} s";
$select_count = "SELECT COUNT(DISTINCT(s.sid)) FROM {l10n_community_string} s";
$join[] = "LEFT JOIN {l10n_community_translation} t ON s.sid = t.sid AND t.language = '%s' AND t.is_active = 1 AND t.is_suggestion = 0";
$join_args[] = $langcode;
+ $join[] = "LEFT JOIN {users} u ON u.uid = t.uid_entered";
+ $join[] = "LEFT JOIN {users} u2 ON u2.uid = t.uid_approved";
// Add submitted by condition
if (!empty($filters['author'])) {
@@ -670,7 +782,7 @@ function l10n_community_get_strings($langcode, $filters, $pager = NULL) {
// Restriction based on string status by translation / suggestions.
$status_sql = '';
- if ($filters['status'] & L10N_STATUS_UNTRANSLATED) {
+ if (isset($filters['status']) && $filters['status'] & L10N_STATUS_UNTRANSLATED) {
// We are doing a LEFT JOIN especially to look into the case, when we have nothing
// to match in the translation table, but we still have the string. (We get our
// records in the result set in this case). The translation field is empty or
@@ -681,7 +793,7 @@ function l10n_community_get_strings($langcode, $filters, $pager = NULL) {
elseif ($filters['status'] & L10N_STATUS_TRANSLATED) {
$where[] = "t.translation != ''";
}
- if ($filters['status'] & L10N_STATUS_HAS_SUGGESTION) {
+ if (isset($filters['status']) && $filters['status'] & L10N_STATUS_HAS_SUGGESTION) {
// Note that we are not searching in the suggestions themselfs, only
// the source and active translation values. The user interface underlines
// that we are looking for strings which have suggestions, not the
@@ -765,3 +877,58 @@ function l10n_community_build_filter_values($params, $suggestions = FALSE) {
}
return $filter;
}
+
+// = AJAX callbacks ============================================================
+
+/**
+ * Return a HTML list of projects, releases and counts of where strings
+ * appear in the managed projects.
+ *
+ * We could have been provided much more information, but usability should
+ * also be kept in mind. It is possible to investigate hidden information
+ * sources though, like tooltips on the release titles presented.
+ *
+ * This callback is invoked from JavaScript and is used as an AHAH provider.
+ *
+ * @param $langcode
+ * Language code.
+ * @param $sid
+ * Source string id.
+ */
+function l10n_community_string_details($langcode = NULL, $sid = 0) {
+ // Prevent devel module information.
+ $GLOBALS['devel_shutdown'] = FALSE;
+
+ // List of project releases, where this string is used.
+ $result = db_query('SELECT l.pid, p.title project_title, l.rid, r.title release_title, COUNT(l.lineno) as occurance_count FROM {l10n_community_line} l INNER JOIN {l10n_community_project} p ON l.pid = p.pid INNER JOIN {l10n_community_release} r ON l.rid = r.rid WHERE l.sid = %d AND p.status = 1 GROUP BY l.rid ORDER BY l.pid, l.rid', $sid);
+
+ $list = array();
+ $output = array();
+ $previous_project = '';
+ while ($instance = db_fetch_object($result)) {
+ if ($instance->project_title != $previous_project) {
+ if (!empty($list)) {
+ $output[] = join(', ', $list);
+ }
+ $list = array(''. $instance->project_title .': '. $instance->release_title .' ('. $instance->occurance_count .')');
+ }
+ else {
+ $list[] = $instance->release_title .' ('. $instance->occurance_count .')';
+ }
+ $previous_project = $instance->project_title;
+ }
+ $output[] = join(', ', $list);
+ $usage_info = ''. t('Used in:') .''. theme('item_list', $output);
+
+ // Information about translator and translation timestamp.
+ $translation_info = '';
+ $translation = db_fetch_object(db_query("SELECT translation, uid_entered, time_entered FROM {l10n_community_translation} WHERE language = '%s' AND sid = %d AND is_active = 1 AND is_suggestion = 0", $langcode, $sid));
+ if (!empty($translation->translation)) {
+ $account = user_load(array('uid' => $translation->uid_entered));
+ $translation_info = t('Translated by:";
- $translation_pane .= !empty($element['translation_existing']) ? drupal_render($element['translation_existing']) : '';
- $translation_pane .= drupal_render($element['messagebox']);
- $translation_pane .= drupal_render($element['translation']) .'
';
- $translation_pane .= "";
- $translation_pane .= "%username at %date', array('%username' => $account->name, '%date' => format_date($translation->time_entered))); + } + + print $usage_info . $translation_info; // . $suggestion_info; + exit; +} + diff --git l10n_community/welcome.inc l10n_community/welcome.inc index 31ad5d0..33df304 100644 --- l10n_community/welcome.inc +++ l10n_community/welcome.inc @@ -177,7 +177,7 @@ function l10n_community_pick_go_submit($form, &$form_state) { if (!empty($form_state['values']['project']) && ($uri = l10n_community_project_uri_by_title($form_state['values']['project']))) { // Project surely selected, possibly with language too. if (!empty($form_state['values']['langcode'])) { - $action = l10n_community_contribute_access($form_state['values']['langcode']) ? 'edit' : 'view'; + $action = l10n_community_get_permission($form_state['values']['langcode'], NULL, L10N_PERMISSION_SUGGEST) ? 'edit' : 'view'; drupal_goto('translate/languages/'. $form_state['values']['langcode'] .'/'. $action, 'project='. $uri); } else { diff --git l10n_groups/l10n_groups.module l10n_groups/l10n_groups.module index aa39d10..bc3b9de 100644 --- l10n_groups/l10n_groups.module +++ l10n_groups/l10n_groups.module @@ -242,17 +242,15 @@ function l10n_groups_block_help($perm, $langcode = NULL) { $groups = l10n_groups_get_groups(); $permission_help = ''; - switch ($perm) { - // Inform user about her permission level in this group. - case L10N_PERM_NONE: - $permission_help = t('You are not a member of this translation group, but you can still view the existing translations and export templates or translations for your own use.') .' '. ($user->uid ? t('Subscribe to this group if you would like to help out.', array('@group' => url('node/'. $groups[$langcode]->nid))) : t('Create an account or log in and subscribe to this group if you would like to help out.', array('@register' => url('user'), '@group' => url('node/'. $groups[$langcode]->nid)))); - break; - case L10N_PERM_SUGGEST: - $permission_help = t('You are a member of this translation group, so you can suggest translations or import complete Gettext translation files to suggest multiple translations at once. Administrators of this group either accept or decline suggestions provided by members of the group. To work offline, export a translation template, which contains the current state of the translation.'); - break; - case L10N_PERM_ALL: - $permission_help = t('As a member of this translation group, you can suggest translations as well as approve translations suggested by other members of the group. Export/import of Gettext translation files is also possible.'); - break; + // Inform user about her permission level in this group. + if (!((L10N_PERMISSION_MODERATE_OTHERS | L10N_PERMISSION_MODERATE_OWN | L10N_PERMISSION_SUGGEST) & ~$perm)) { + $permission_help = t('As a member of this translation group, you can suggest translations as well as approve translations suggested by other members of the group. Export/import of Gettext translation files is also possible.'); + } + elseif (L10N_PERMISSION_SUGGEST & $perm) { + $permission_help = t('You are a member of this translation group, so you can suggest translations or import complete Gettext translation files to suggest multiple translations at once. Administrators of this group either accept or decline suggestions provided by members of the group. To work offline, export a translation template, which contains the current state of the translation.'); + } + elseif (L10N_PERMISSION_VIEW & $perm) { + $permission_help = t('You are not a member of this translation group, but you can still view the existing translations and export templates or translations for your own use.') .' '. ($user->uid ? t('Subscribe to this group if you would like to help out.', array('@group' => url('node/'. $groups[$langcode]->nid))) : t('Create an account or log in and subscribe to this group if you would like to help out.', array('@register' => url('user'), '@group' => url('node/'. $groups[$langcode]->nid)))); } return '
'. $permission_help .'
'; } @@ -280,36 +278,33 @@ function l10n_groups_get_groups() { /** * Get permission level for a specific user based on group membership. * - * The group permissio model is taken into account and membership of + * The group permission model is taken into account and membership of * the user in language groups is checked. * * @param $permissions * Permission cache array to tunnel cache values to. - * @param $global_permission - * Permission based on user access settings to consider as a base. - * @param $langcode - * Language code, for example 'hu', 'pt-br', 'de' or 'it'. * @param $account * Optional user account. + * @param $global + * Permission based on user access settings to consider as a base. */ -function l10n_groups_get_permission(&$permissions, $global_permission, $langcode, $account) { +function l10n_groups_get_permission(&$permissions, $account, $global) { if ($groups = l10n_groups_get_groups()) { // Fill up local cache with all langcode permissions of this account for // future reference (eg. a page showing links for all languages). foreach ($groups as $group) { - $permission = L10N_PERM_NONE; - if (!empty($account->og_groups) and !empty($account->og_groups[$group->nid])) { - if (!empty($account->og_groups[$group->nid]['is_admin'])) { - // Administrators of groups have all permissions in the group. - $permission = L10N_PERM_ALL; - } - elseif ($account->og_groups[$group->nid]['is_active']) { - // Members in the group have a permission depending on the model used. - $permission = ($group->model == L10N_MODEL_OPEN ? L10N_PERM_ALL : L10N_PERM_SUGGEST); - } + $permission = $global; + + if (empty($account->og_groups) || empty($account->og_groups[$group->nid])) { + // The user is not in the group and may therefore only view. + $permission = $permission & ~(L10N_PERMISSION_CONTRIBUTE | L10N_PERMISSION_REVIEW); } - // Save the lowest common denominator of permissions given. - $permissions[$account->uid][$group->language] = min($permission, $global_permission); + elseif (empty($account->og_groups[$group->nid]['is_admin']) && $group->model != L10N_MODEL_OPEN) { + // Non-Admins of group don't have these permissions. + $permission = $permission & ~(L10N_PERMISSION_REVIEW); + } + + $permissions[$account->uid][$group->language] = $permission; } } } diff --git l10n_remote/l10n_remote.module l10n_remote/l10n_remote.module index a5496ee..c535a19 100644 --- l10n_remote/l10n_remote.module +++ l10n_remote/l10n_remote.module @@ -127,7 +127,7 @@ function l10n_remote_xmlrpc_string_submit($langcode, $source, $translation, $uid watchdog('l10n_community', 'Language not allowed for remote submission.', NULL, WATCHDOG_WARNING); return array('status' => FALSE, 'reason' => 'Language not accepted.'); } - elseif (l10n_community_get_permission($langcode, $account) == L10N_PERM_NONE) { + elseif (!l10n_community_get_permission($langcode, $account, L10N_PERMISSION_SUGGEST)) { watchdog('l10n_community', 'Not allowed to submit translations in this language remotely.', NULL, WATCHDOG_WARNING); return array('status' => FALSE, 'reason' => 'Not allowed to submit translations in this language.'); }