tpl/tplimpl: Change calls to simple versions of embedded shortcodes

Closes #13700

Author: jmooring

tpl/tplimpl/embedded/templates/_shortcodes/twitter.html

@@ -2,7 +2,7 @@
 {{- $pc := site.Config.Privacy.Twitter -}}
 {{- if not $pc.Disable -}}
   {{- if $pc.Simple -}}
-    {{- template "_internal/shortcodes/twitter_simple.html" . -}}
+    {{- template "_shortcodes/twitter_simple.html" . -}}
   {{- else -}}
     {{- $id := or (.Get "id") "" -}}
     {{- $user := or (.Get "user") "" -}}

tpl/tplimpl/embedded/templates/_shortcodes/vimeo.html

@@ -18,7 +18,7 @@
 {{- $pc := site.Config.Privacy.Vimeo }}
 {{- if not $pc.Disable }}
   {{- if $pc.Simple }}
-    {{- template "_internal/shortcodes/vimeo_simple.html" . }}
+    {{- template "_shortcodes/vimeo_simple.html" . }}
   {{- else }}
     {{- $dnt := cond $pc.EnableDNT 1 0 }}
 

tpl/tplimpl/embedded/templates/_shortcodes/x.html

@@ -1,7 +1,7 @@
 {{- $pc := site.Config.Privacy.X -}}
 {{- if not $pc.Disable -}}
   {{- if $pc.Simple -}}
-    {{- template "_internal/shortcodes/x_simple.html" . -}}
+    {{- template "_shortcodes/x_simple.html" . -}}
   {{- else -}}
     {{- $id := or (.Get "id") "" -}}
     {{- $user := or (.Get "user") "" -}}

tpl/tplimpl/shortcodes_integration_test.go

@@ -460,7 +460,6 @@ title: p1 (de)
 }
 
 func TestVimeoShortcode(t *testing.T) {
-	t.Skip("Fix me: Upstream API changes")
 	t.Parallel()
 
 	files := `