diff --git a/src/blocks/MapBlock.php b/src/blocks/MapBlock.php
index 414f29b..fb2e8cc 100644
--- a/src/blocks/MapBlock.php
+++ b/src/blocks/MapBlock.php
@@ -2,6 +2,7 @@
 
 namespace luya\bootstrap3\blocks;
 
+use Yii;
 use luya\bootstrap3\Module;
 use luya\bootstrap3\BaseBootstrap3Block;
 use luya\bootstrap3\blockgroups\Bootstrap3Group;
@@ -124,6 +125,15 @@ public function extraVars()
      */
     public function admin()
     {
-        return '{% if vars.address is not empty %}<div class="iframe-container"><iframe src="{% if cfgs.snazzymapsUrl %}{{ cfgs.snazzymapsUrl }}{% else %}http://maps.google.com/maps?f=q&source=s_q&hl=de&geocode=&q={{ extras.address }}&z={{ extras.zoom }}&t={{ extras.maptype }}&output=embed{% endif %}"></iframe></div>{% else %}<span class="block__empty-text">' . Module::t('block_map_no_content') . '</span>{% endif %}';
+        $language = Yii::$app->composition['langShortCode'];
+        return <<<EOT
+          {% if vars.address is not empty %}
+            <div class="iframe-container">
+              <iframe src="{% if cfgs.snazzymapsUrl %}{{ cfgs.snazzymapsUrl }}{% else %}http://maps.google.com/maps?f=q&source=s_q&hl={$language}&geocode=&q={{ extras.address }}&z={{ extras.zoom }}&t={{ extras.maptype }}&output=embed{% endif %}"></iframe>
+            </div>
+          {% else %}
+            <span class="block__empty-text">' . Module::t('block_map_no_content') . '</span>
+          {% endif %}
+EOT;
     }
 }
diff --git a/src/views/blocks/MapBlock.php b/src/views/blocks/MapBlock.php
index 8a76238..f328f7b 100644
--- a/src/views/blocks/MapBlock.php
+++ b/src/views/blocks/MapBlock.php
@@ -8,6 +8,6 @@
 ?>
 <?php if (!empty($this->varValue('address'))):?>
     <div class="embed-responsive embed-responsive-16by9">
-            <iframe src="<? if ($this->cfgValue('snazzymapsUrl', false)): ?><?= $this->cfgValue('snazzymapsUrl', '') ?><? else: ?>https://maps.google.com/maps?f=q&source=s_q&hl=de&geocode=&q=<?= $this->extraValue('address');?>&z=<?= $this->extraValue('zoom');?>&t=<?= $this->extraValue('maptype')?>&output=embed<? endif; ?>" width="600" height="450" frameborder="0" style="border:0"></iframe>
+            <iframe src="<? if ($this->cfgValue('snazzymapsUrl', false)): ?><?= $this->cfgValue('snazzymapsUrl', '') ?><? else: ?>https://maps.google.com/maps?f=q&source=s_q&hl=<?= \Yii::$app->composition['langShortCode']; ?>&geocode=&q=<?= $this->extraValue('address');?>&z=<?= $this->extraValue('zoom');?>&t=<?= $this->extraValue('maptype')?>&output=embed<? endif; ?>" width="600" height="450" frameborder="0" style="border:0"></iframe>
     </div>
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>