diff --git a/app/ring_groups/app_languages.php b/app/ring_groups/app_languages.php index 2ef965e5bd..919df694e0 100644 --- a/app/ring_groups/app_languages.php +++ b/app/ring_groups/app_languages.php @@ -186,6 +186,10 @@ $text['option-usring']['pt-pt'] = "us-ring"; $text['option-usring']['fr-fr'] = "us-ring"; + $text['option-ptring']['en-us'] = "pt-ring"; + $text['option-ptring']['pt-pt'] = "pt-ring"; + $text['option-ptring']['fr-fr'] = "pt-ring"; + $text['option-frring']['en-us'] = "fr-ring"; $text['option-frring']['pt-pt'] = "fr-ring"; $text['option-frring']['fr-fr'] = "fr-ring"; diff --git a/app/ring_groups/ring_group_edit.php b/app/ring_groups/ring_group_edit.php index 873130a97a..edc3319b82 100644 --- a/app/ring_groups/ring_group_edit.php +++ b/app/ring_groups/ring_group_edit.php @@ -654,6 +654,12 @@ else { else { $select_options .= " \n"; } + if ($ring_group_ringback == "\${pt-ring}" || $ring_group_ringback == "pt-ring") { + $select_options .= " \n"; + } + else { + $select_options .= " \n"; + } if ($ring_group_ringback == "\${fr-ring}" || $ring_group_ringback == "fr-ring") { $select_options .= " \n"; } diff --git a/resources/classes/menu.php b/resources/classes/menu.php index 7c32a9e66e..b6f00aef6b 100644 --- a/resources/classes/menu.php +++ b/resources/classes/menu.php @@ -267,7 +267,7 @@ //echo $sql."
\n"; } else { - $db->exec(check_sql($sql)); + $db->exec(utf8_encode(check_sql($sql))); } unset($sql); @@ -290,7 +290,7 @@ $sql .= "'".$menu_language."', "; $sql .= "'".check_str($menu_item_title)."' "; $sql .= ")"; - $db->exec(check_sql($sql)); + $db->exec(utf8_encode(check_sql($sql))); unset($sql); } } diff --git a/resources/install/scripts/app/ring_groups/index.lua b/resources/install/scripts/app/ring_groups/index.lua index a7ef27c5f5..f5809b1d27 100644 --- a/resources/install/scripts/app/ring_groups/index.lua +++ b/resources/install/scripts/app/ring_groups/index.lua @@ -184,6 +184,9 @@ if (ring_group_ringback == "${us-ring}") then ring_group_ringback = "tone_stream://%(2000,4000,440.0,480.0);loops=-1"; end + if (ring_group_ringback == "${pt-ring}") then + ring_group_ringback = "tone_stream://%(1000,5000,400.0,0.0);loops=-1"; + end if (ring_group_ringback == "${fr-ring}") then ring_group_ringback = "tone_stream://%(1500,3500,440.0,0.0);loops=-1"; end