aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2019-05-04 22:37:21 +0200
committerMax Kostikov <max@kostikov.co>2019-05-04 22:37:21 +0200
commit2aa76d257ccd29144234408563c46d5af10a83c0 (patch)
tree33390ef8c49a2fe1695841d5123dfaccfd50f68a /view
parent32c0be8bde0f59f23231b0094163a1c4295d4fc8 (diff)
parent1da46025676d2aae84e4f90e8f6fef733ff156eb (diff)
downloadvolse-hubzilla-2aa76d257ccd29144234408563c46d5af10a83c0.tar.gz
volse-hubzilla-2aa76d257ccd29144234408563c46d5af10a83c0.tar.bz2
volse-hubzilla-2aa76d257ccd29144234408563c46d5af10a83c0.zip
Merge branch 'db_update' into 'dev'
port db update improvements from zap See merge request hubzilla/core!1628
Diffstat (limited to 'view')
-rw-r--r--view/en/update_fail_eml.tpl21
-rwxr-xr-xview/tpl/failed_updates.tpl1
2 files changed, 16 insertions, 6 deletions
diff --git a/view/en/update_fail_eml.tpl b/view/en/update_fail_eml.tpl
index 86bb61aaa..c42ea90c4 100644
--- a/view/en/update_fail_eml.tpl
+++ b/view/en/update_fail_eml.tpl
@@ -1,13 +1,22 @@
-Hey,
-I'm the web server at {{$sitename}};
+Apologies but this may be urgent.
+
+This is the web server at {{$sitename}};
-The Hubzilla developers released update {{$update}} recently,
-but when I tried to install it, something went terribly wrong.
+The project developers released update {{$update}} recently,
+but during the attempt to automatically install it, something went terribly wrong.
This needs to be fixed soon and it requires human intervention.
Please contact a project developer if you can not figure out how to
-fix it on your own. My database might be invalid.
+fix it on your own. Your web server database configuration might be invalid.
The error message is '{{$error}}'.
+You may attempt to re-apply this update by visiting
+
+{{$baseurl}}/admin/dbsync
+
+while logged into the admin account.
+
+{{$source}}
+
Apologies for the inconvenience,
- your web server at {{$siteurl}} \ No newline at end of file
+ your web server at {{$siteurl}}
diff --git a/view/tpl/failed_updates.tpl b/view/tpl/failed_updates.tpl
index f53f1f478..598171b87 100755
--- a/view/tpl/failed_updates.tpl
+++ b/view/tpl/failed_updates.tpl
@@ -9,6 +9,7 @@
<h4>{{$f}}</h4>
<ul>
<li><a href="{{$base}}/admin/dbsync/mark/{{$f}}">{{$mark}}</a></li>
+<li><a href="{{$base}}/admin/dbsync/verify/{{$f}}">{{$verify}}</a></li>
<li><a href="{{$base}}/admin/dbsync/{{$f}}">{{$apply}}</a></li>
</ul>