Merge branch 'master' of github.com:manjaro/pamac

po/fr.po

@@ -412,6 +412,10 @@ msgstr "Dépendances optionnelles"
 msgid "Required By"
 msgstr "Requis par"
 
+#: ../src/manager_window.vala
+msgid "Optional For"
+msgstr "Optionnel pour"
+
 #: ../src/manager_window.vala
 msgid "Provides"
 msgstr "Fournit"

po/pamac.pot

@@ -401,6 +401,10 @@ msgstr ""
 msgid "Required By"
 msgstr ""
 
+#: ../src/manager_window.vala
+msgid "Optional For"
+msgstr ""
+
 #: ../src/manager_window.vala
 msgid "Provides"
 msgstr ""

po/update_po_files.sh

@@ -1,5 +1,5 @@
 #! /bin/sh
 
 for i in `ls ./ | sed s'|.po||'` ; do
-	msgmerge --update --no-fuzzy-matching --add-location=file --backup=none ./$i.po pamac.pot
+	msgmerge --update --no-fuzzy-matching --no-wrap --add-location=file --backup=none ./$i.po pamac.pot
 done

src/daemon.vala

@@ -637,6 +637,7 @@ namespace Pamac {
 			string[] depends = {};
 			string[] optdepends = {};
 			string[] requiredby = {};
+			string[] optionalfor = {};
 			string[] provides = {};
 			string[] replaces = {};
 			string[] conflicts = {};
@@ -671,11 +672,21 @@ namespace Pamac {
 					}
 					Alpm.List.free_all (list);
 				}
+				if (alpm_pkg.db.name == "local") {
+					Alpm.List<string?> *list = alpm_pkg.compute_optionalfor ();
+					int i = 0;
+					while (i < list->length) {
+						optionalfor += list->nth_data (i);
+						i++;
+					}
+					Alpm.List.free_all (list);
+				}
 			}
 			deps.repo = repo;
 			deps.depends = depends;
 			deps.optdepends = optdepends;
 			deps.requiredby = requiredby;
+			deps.optionalfor = optionalfor;
 			deps.provides = provides;
 			deps.replaces = replaces;
 			deps.conflicts = conflicts;

src/manager_window.vala

@@ -308,6 +308,19 @@ namespace Pamac {
 					}
 				}
 			}
+			if (deps.repo == "local") {
+				if (deps.optionalfor.length != 0) {
+					deps_list.insert_with_values (out iter, -1,
+													0, dgettext (null, "Optional For") + ":",
+													1, deps.optionalfor[0]);
+					i = 1;
+					while (i < deps.optionalfor.length) {
+						deps_list.insert_with_values (out iter, -1,
+													1, deps.optionalfor[i]);
+						i++;
+					}
+				}
+			}
 			if (deps.provides.length != 0) {
 				deps_list.insert_with_values (out iter, -1,
 												0, dgettext (null, "Provides") + ":",

src/package.vala

@@ -87,6 +87,7 @@ namespace Pamac {
 		string[] depends;
 		string[] optdepends;
 		string[] requiredby;
+		string[] optionalfor;
 		string[] provides;
 		string[] replaces;
 		string[] conflicts;

src/transaction.vala

@@ -948,7 +948,12 @@ namespace Pamac {
 					progress_dialog.spawn_in_term ({"echo", msg});
 					break;
 				case Alpm.Event.Type.OPTDEP_REMOVAL:
-					progress_dialog.spawn_in_term ({"echo", dgettext (null, "%s optionally requires %s").printf (details[0], details[1])});
+					msg = dgettext (null, "%s optionally requires %s").printf (details[0], details[1]);
+					progress_dialog.spawn_in_term ({"echo", msg});
+					Gtk.TextIter end_iter;
+					msg += "\n";
+					transaction_info_dialog.textbuffer.get_end_iter (out end_iter);
+					transaction_info_dialog.textbuffer.insert (ref end_iter, msg, msg.length);
 					break;
 				case Alpm.Event.Type.DATABASE_MISSING:
 					progress_dialog.spawn_in_term ({"echo", dgettext (null, "Database file for %s does not exist").printf (details[0])});