chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge

Browse Source
skala
aportugal 17 years ago
parent e9e14cd4a2 bbbeb075a3
commit dccbe6dae2
9 changed files with 1671 additions and 1739 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      main/inc/lib/database.lib.php
  2. 56
      main/inc/lib/display.lib.php
  3. 1068
      main/inc/lib/fckeditor/editor/lang/es.js
  4. 6
      main/inc/lib/fckeditor/editor/plugins/MP3/lang/es.js
  5. 10
      main/inc/lib/fckeditor/editor/plugins/audio/lang/es.js
  6. 20
      main/inc/lib/fckeditor/editor/plugins/fckEmbedMovies/lang/es.js
  7. 84
      main/inc/lib/fckeditor/editor/plugins/flvPlayer/lang/es.js
  8. 40
      main/inc/lib/fckeditor/editor/plugins/youtube/lang/es.js
  9. 2118
      main/inc/lib/main_api.lib.php

8
main/inc/lib/database.lib.php
Unescape View File

@ -814,7 +814,7 @@ class Database {
}
}
/**
* This function return a resource
* This function return a resource
* documentation has been added by Arthur Portugal
* @author Olivier Brouckaert;
* @param string $query - SQL query
@ -822,7 +822,7 @@ class Database {
* @param string $line - optional, the line of the error (__LINE__)
* @return resource - the return value of the query
*/
public static function query ($sql,$file='',$line=0) {
return api_sql_query($sql,$file,$line);
}
@ -844,9 +844,9 @@ class Database {
return $option['course_code'];
} else {
return false;
}
}
}
}
//end class Database

56
main/inc/lib/display.lib.php
Unescape View File

@ -87,7 +87,7 @@
require_once 'sortabletable.class.php';
class Display {
private function __construct() {
}
/**
* Displays the tool introduction of a tool.
@ -95,7 +95,7 @@ class Display {
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
* @param string $tool These are the constants that are used for indicating the tools.
* @param array $editor_config Optional configuration settings for the online editor.
* @return $tool return a string array list with the "define" in main_api.lib
* @return $tool return a string array list with the "define" in main_api.lib
* @return html code for adding an introduction
*/
public static function display_introduction_section ($tool, $editor_config = null) {
@ -276,21 +276,21 @@ class Display {
global $origin;
$column = isset ($sorting_options['column']) ? $sorting_options['column'] : 0;
$default_items_per_page = isset ($paging_options['per_page']) ? $paging_options['per_page'] : 20;
$table = new SortableTableFromArray($content, $column, $default_items_per_page);
if (is_array($query_vars)) {
$table->set_additional_parameters($query_vars);
}
foreach ($header as $index => $header_item)
{
{
$table->set_header($index, $header_item[0], $header_item[1], $header_item[2], $header_item[3]);
}
$table->set_form_actions($form_actions);
$table->display();
}
/**
* Display a table with a special configuration
* @param array $header Titles for the table header
@ -311,43 +311,43 @@ class Display {
* 'page_nr' = The page to display
* @param array $query_vars Additional variables to add in the query-string
* @param array $column_show Array of binaries 1= show columns 0. hide a column
* @param array $column_order An array of integers that let us decide how the columns are going to be sort.
* i.e: $column_order=array('1''4','3','4'); The 2nd column will be order like the 4th column
* @param array $column_order An array of integers that let us decide how the columns are going to be sort.
* i.e: $column_order=array('1''4','3','4'); The 2nd column will be order like the 4th column
* @param array $form_actions Set optional forms actions
*
*
* @author Julio Montoya
*/
public static function display_sortable_config_table ($header, $content, $sorting_options = array (), $paging_options = array (), $query_vars = null, $column_show=array(),$column_order=array(),$form_actions=array()) {
global $origin;
$column = isset ($sorting_options['column']) ? $sorting_options['column'] : 0;
$default_items_per_page = isset ($paging_options['per_page']) ? $paging_options['per_page'] : 20;
$table = new SortableTableFromArrayConfig($content, $column, $default_items_per_page,'tablename',$column_show,$column_order);
if (is_array($query_vars)) {
$table->set_additional_parameters($query_vars);
}
// show or hide the columns header
if (is_array($column_show) )
if (is_array($column_show) )
{
for ($i=0;$i<count($column_show);$i++)
{
if (!empty($column_show[$i]))
{
{
isset($header[$i][0])?$val0=$header[$i][0]:$val0=null;
isset($header[$i][1])?$val1=$header[$i][1]:$val1=null;
isset($header[$i][2])?$val2=$header[$i][2]:$val2=null;
isset($header[$i][3])?$val3=$header[$i][3]:$val3=null;
isset($header[$i][3])?$val3=$header[$i][3]:$val3=null;
$table->set_header($i, $val0, $val1, $val2, $val3);
}
}
}
}
}
$table->set_form_actions($form_actions);
$table->display();
}
}
/**
* Displays a normal message. It is recommended to use this public function
* to display any normal information messages.
@ -487,7 +487,7 @@ class Display {
* @return - encrypted mailto hyperlink
*/
public static function encrypted_mailto_link ($email, $clickable_text = null, $style_class = '') {
global $charset;
global $charset;
if (is_null($clickable_text))
{
$clickable_text = $email;
@ -508,7 +508,7 @@ class Display {
}
//encrypt clickable text if @ is present
if (strpos($clickable_text, '@')) {
for ($i = 0; $i < strlen($clickable_text); $i ++) {
$hclickable_text .= '&#'.ord($clickable_text {
$i }).';';
@ -579,10 +579,10 @@ class Display {
}
return $result;
}
public static function get_numeric_options ($min,$max, $selected_num = 0) {
$result = '';
for ($i = $min; $i <= $max; $i ++) {
for ($i = $min; $i <= $max; $i ++) {
$result .= '<option value="'.$i.'"';
if (is_int($selected_num))
if ($selected_num == $i) {
@ -592,7 +592,7 @@ class Display {
}
return $result;
}
/**
* Show the so-called "left" menu for navigating
*/
@ -687,23 +687,23 @@ class Display {
}
return '<img src="'.api_get_path(WEB_IMG_PATH).$image.'" alt="'.$alt_text.'" title="'.$alt_text.'" '.$attribute_list.' />';
}
/**
* Ivan, 05-SEP-2009: Deprecated, see api_get_person_name().
*
* Display name and lastname in a specific order
* @param string Firstname
* @param string Firstname
* @param string Lastname
* @param string Title in the destination language (Dr, Mr, Miss, Sr, Sra, etc)
* @param string Optional format string (e.g. '%t. %l, %f')
* @author Carlos Vargas <carlos.vargas@dokeos.com>
*/
public static function user_name($fname,$lname,$title='',$format=null) {
if (empty($format)){
if (empty($format)){
if (empty($fname) or empty($lname)) {
$user_name = $fname.$lname;
} else {
$user_name= $fname.' '.$lname;
$user_name= $fname.' '.$lname;
}
} else {
$find = array('%t','%f','%l');

1068
main/inc/lib/fckeditor/editor/lang/es.js
View File

File diff suppressed because it is too large Load Diff

6
main/inc/lib/fckeditor/editor/plugins/MP3/lang/es.js
Unescape View File

@ -2,6 +2,6 @@
// MP3 Dialog.
// Please, use UTF-8 encoding.
FCKLang["DlgMP3Title"] = "Import MP3" ;
FCKLang["DlgMP3Upload"] = "From my Computer" ;
FCKLang["DlgMP3Tab"] = "From course" ;
FCKLang["DlgMP3Title"] = "Importar MP3" ;
FCKLang["DlgMP3Upload"] = "Desde mi Ordenador" ;
FCKLang["DlgMP3Tab"] = "Desde mi curso" ;

10
main/inc/lib/fckeditor/editor/plugins/audio/lang/es.js
Unescape View File

@ -1,8 +1,8 @@
// Audio Dialog.
// Spanish language file.
// Please, use UTF-8 encoding.
FCKLang['DlgAudioTitle'] = 'Insert audio / Audio properties' ;
FCKLang['DlgAudioPlayback'] = 'Playback' ;
FCKLang['DlgAudioAutoplay'] = 'Autoplay' ;
// Please, use UTF-8 encoding.
FCKLang['DlgAudioTitle'] = 'Insertar audio/Propiedades de audio' ;
FCKLang['DlgAudioPlayback'] = 'Audici&oacute;n previa' ;
FCKLang['DlgAudioAutoplay'] = 'Reproducci&oacute;n autom&aacute;tica' ;

20
main/inc/lib/fckeditor/editor/plugins/fckEmbedMovies/lang/es.js
Unescape View File

@ -1,14 +1,14 @@
// Spanish language file.
// Video Dialog.
// Please, use UTF-8 encoding.
FCKLang["DlgEmbedMoviesTitle"] = "Insert video / Video properties" ;
FCKLang["DlgEmbedMoviesAutosize"] = "Auto size" ;
FCKLang["DlgEmbedMoviesGotoBar"] = "Show gotobar" ;
FCKLang["DlgEmbedMoviesStatusbar"] = "Show statusbar" ;
FCKLang["DlgEmbedMoviesControls"] = "Show controls" ;
FCKLang["DlgEmbedMoviesPositionControls"] = "Position controls" ;
FCKLang["DlgEmbedMoviesTracker"] = "Tracker" ;
FCKLang["DlgEmbedMoviesAudioControls"] = "Audio controls" ;
FCKLang["DlgEmbedMoviesExtensionSupported"] = "Only a mpg, mpeg, mp4, avi, wmv, mov or asf file extension is allowed." ;
FCKLang["DlgEmbedMoviesTitle"] = "Insertar video/Propiedades de video" ;
FCKLang["DlgEmbedMoviesAutosize"] = "Autoajuste del tama&ntilde;o" ;
FCKLang["DlgEmbedMoviesGotoBar"] = "Mostrar barra Ir" ;
FCKLang["DlgEmbedMoviesStatusbar"] = "Mostrar barra de estado" ;
FCKLang["DlgEmbedMoviesControls"] = "Mostrar controles" ;
FCKLang["DlgEmbedMoviesPositionControls"] = "Controles de posici&oacute;n" ;
FCKLang["DlgEmbedMoviesTracker"] = "Seguimiento" ;
FCKLang["DlgEmbedMoviesAudioControls"] = "Controles de audio" ;
FCKLang["DlgEmbedMoviesExtensionSupported"] = "S&oacute;lo est&aacute;n permitidos los archivos con extensi&oacute;n mpg, mpeg, mp4, avi, wmv, mov, asf" ;

84
main/inc/lib/fckeditor/editor/plugins/flvPlayer/lang/es.js
Unescape View File

@ -3,45 +3,45 @@
// Please, use UTF-8 encoding.
FCKLang["DlgFLVPlayerTitle"] = "FLV Media Player" ;
FCKLang["DlgFLVPlayerURL"] = "Movie/Media File" ;
FCKLang["DlgFLVPlayerBtnBrowse"] = "Browse..." ;
FCKLang["DlgFLVPlayerImgURL"] = "Preview Image" ;
FCKLang["DlgFLVPlayerWidth"] = "Player Width (px)" ;
FCKLang["DlgFLVPlayerHeight"] = "Player Height (px)" ;
FCKLang["DlgFLVPlayerAlign"] = "Player Alignment" ;
FCKLang["DlgFLVPlayerAlignLeft"] = "Left" ;
FCKLang["DlgFLVPlayerAlignRight"] = "Right" ;
FCKLang["DlgFLVPlayerAlignCenter"] = "Center" ;
FCKLang["DlgFLVPlayerHSpace"] = "HSpace" ;
FCKLang["DlgFLVPlayerVSpace"] = "VSpace" ;
FCKLang["DlgFLVPlayerBgColor"] = "Background Color" ;
FCKLang["DlgFLVPlayerTBColor"] = "Toolbar Color" ;
FCKLang["DlgFLVPlayerTBTColor"] = "Text Color" ;
FCKLang["DlgFLVPlayerTBTRColor"] = "Rollover Text Color" ;
FCKLang["DlgFLVPlayerBtnSelect"] = "Select..." ;
FCKLang["DlgFLVPlayerAutoplay"] = "Autoplay" ;
FCKLang["DlgFLVPlayerLoop"] = "Loop" ;
FCKLang["DlgFLVPlayerDownload"] = "Downloadable" ;
FCKLang["DlgFLVPlayerFullscreen"] = "Allow Fullscreen" ;
FCKLang["DlgFLVPlayerAlertUrl"] = "Please input the URL" ;
FCKLang["DlgFLVPlayerAlertPlaylist"] = "Please input the Playlist URL" ;
FCKLang["DlgFLVPlayerAlertWidth"] = "Please input the Width" ;
FCKLang["DlgFLVPlayerAlertHeight"] = "Please input the Height" ;
FCKLang["DlgFLVPlayerPlayerAttrs"] = "Player Attributes" ;
FCKLang["DlgFLVPlayerMovieAttrs"] = "Media Attributes" ;
FCKLang["DlgFLVPlayerShowNavigation"] = "Display Navigation" ;
FCKLang["DlgFLVPlayerShowDigits"] = "Display Time" ;
FCKLang["DlgFLVPlayerWatermarkURL"] = "Watermark Image" ;
FCKLang["DlgFLVPlayerFileType"] = "File Type" ;
FCKLang["DlgFLVPlayerSingleFile"] = "Single Media File" ;
FCKLang["DlgFLVPlayerPlaylistFile"] = "Media Playlist" ;
FCKLang["DlgFLVPlayerPlaylistURL"] = "Playlist URL" ;
FCKLang["DlgFLVPlayerDispPlaylist"] = "Display Playlist" ;
FCKLang["DlgFLVPlayerDispPLNone"] = "Do Not Display" ;
FCKLang["DlgFLVPlayerDispPLRight"] = "Display On Right" ;
FCKLang["DlgFLVPlayerDispPLBelow"] = "Display Below" ;
FCKLang["DlgFLVPlayerRecommendURL"] = "Recommendations List" ;
FCKLang["DlgFLVPlaylistWidth"] = "Playlist Width (px)" ;
FCKLang["DlgFLVPlaylistHeight"] = "Playlist Height (px)" ;
FCKLang["DlgFLVPlaylistDimText"] = "Playlist Dimension" ;
FCKLang["DlgFLVPlayerPLThumbs"] = "Display Thumbnails in Playlist" ;
FCKLang["DlgFLVPlayerURL"] = "Pel&iacute;cula/Archivo de medios (flv, mov, swf, mp3, mp4)" ;
FCKLang["DlgFLVPlayerBtnBrowse"] = "Ver Servidor" ;
FCKLang["DlgFLVPlayerImgURL"] = "Imagen de previsualizaci&oacute;n" ;
FCKLang["DlgFLVPlayerWidth"] = "Anchura (px)" ;
FCKLang["DlgFLVPlayerHeight"] = "Altura (px)" ;
FCKLang["DlgFLVPlayerAlign"] = "Alineaci&oacute;n del reproductor" ;
FCKLang["DlgFLVPlayerAlignLeft"] = "Izquierda" ;
FCKLang["DlgFLVPlayerAlignRight"] = "Derecha" ;
FCKLang["DlgFLVPlayerAlignCenter"] = "Centrado" ;
FCKLang["DlgFLVPlayerHSpace"] = "Espacio H" ;
FCKLang["DlgFLVPlayerVSpace"] = "Espacio V" ;
FCKLang["DlgFLVPlayerBgColor"] = "Color de fondo" ;
FCKLang["DlgFLVPlayerTBColor"] = "Barra de colores" ;
FCKLang["DlgFLVPlayerTBTColor"] = "Color del texto" ;
FCKLang["DlgFLVPlayerTBTRColor"] = "Color del texto rollover" ;
FCKLang["DlgFLVPlayerBtnSelect"] = "Seleccionar" ;
FCKLang["DlgFLVPlayerAutoplay"] = "Inicio autom&aacute;tico" ;
FCKLang["DlgFLVPlayerLoop"] = "Repetir" ;
FCKLang["DlgFLVPlayerDownload"] = "Permitir descarga" ;
FCKLang["DlgFLVPlayerFullscreen"] = "Permitir pantalla completa" ;
FCKLang["DlgFLVPlayerAlertUrl"] = "Por favor, introduzca la URL" ;
FCKLang["DlgFLVPlayerAlertPlaylist"] = "Por favor, introduzca la URL de la lista de reproducción (xml)" ;
FCKLang["DlgFLVPlayerAlertWidth"] = "Por favor, introduzca la anchura" ;
FCKLang["DlgFLVPlayerAlertHeight"] = "Por favor, introduzca la altura" ;
FCKLang["DlgFLVPlayerPlayerAttrs"] = "Atributos de reproducci&oacute;n" ;
FCKLang["DlgFLVPlayerMovieAttrs"] = "Atributos del medio" ;
FCKLang["DlgFLVPlayerShowNavigation"] = "Mostrar navegación" ;
FCKLang["DlgFLVPlayerShowDigits"] = "Mostrar tiempo" ;
FCKLang["DlgFLVPlayerWatermarkURL"] = "Imagen marca de agua" ;
FCKLang["DlgFLVPlayerFileType"] = "Tipo de archivo" ;
FCKLang["DlgFLVPlayerSingleFile"] = "Un archivo de medios" ;
FCKLang["DlgFLVPlayerPlaylistFile"] = "Lista de reproducci&oacute;n de medios" ;
FCKLang["DlgFLVPlayerPlaylistURL"] = "URL de la lista de reproducci&oacute;n" ;
FCKLang["DlgFLVPlayerDispPlaylist"] = "Mostrar la lista de reproducci&oacute;n" ;
FCKLang["DlgFLVPlayerDispPLNone"] = "No mostrar" ;
FCKLang["DlgFLVPlayerDispPLRight"] = "Mostrar a la derecha" ;
FCKLang["DlgFLVPlayerDispPLBelow"] = "Mostrar debajo" ;
FCKLang["DlgFLVPlayerRecommendURL"] = "Lista de recomendaciones" ;
FCKLang["DlgFLVPlaylistWidth"] = "Anchura de la lista de reproducci&oacute;n (px)" ;
FCKLang["DlgFLVPlaylistHeight"] = "Altura de la lista de reproducci&oacute;n (px)" ;
FCKLang["DlgFLVPlaylistDimText"] = "Tama&ntilde;o de la lista de reproducci&oacute;n" ;
FCKLang["DlgFLVPlayerPLThumbs"] = "Mostrar miniaturas en la lista de reproducci&oacute;n" ;

40
main/inc/lib/fckeditor/editor/plugins/youtube/lang/es.js
Unescape View File

@ -1,20 +1,20 @@
/*
* Please, use UTF-8 encoding.
*
* Spanish language file.
*/
FCKLang['YouTubeTip'] = 'Insert/Edit YouTube' ;
FCKLang['DlgYouTubeTitle'] = 'YouTube Property' ;
FCKLang['DlgYouTubeCode'] = '"Please insert the URL of YouTube videos."' ;
FCKLang['DlgYouTubeSecurity'] = 'Invalid URL.' ;
FCKLang['DlgYouTubeURL'] = 'URL' ;
FCKLang['DlgYouTubeWidth'] = 'Width' ;
FCKLang['DlgYouTubeHeight'] = 'Height' ;
FCKLang['DlgYouTubeQuality'] = 'Quality' ;
FCKLang['DlgYouTubeLow'] = 'Low' ;
FCKLang['DlgYouTubeHigh'] = 'High (If available)' ;
FCKLang['DlgYouTubeURLTip'] = 'Tip:' ;
FCKLang['DlgYouTubeURLTipContent1'] = 'Go to %s. Navigate within the site to find your video.' ;
FCKLang['DlgYouTubeURLTipContent2'] = 'Copy the URL of the video from your browser\'s address box and paste it in this dialog, the "URL" box.' ;
FCKLang['DlgYouTubeURLTipContent3'] = 'The copied URL should look like %s.' ;
/*
* Please, use UTF-8 encoding.
*
* Spanish language file.
*/
FCKLang['YouTubeTip'] = 'Insertar/Editar Videos de YouTube' ;
FCKLang['DlgYouTubeTitle'] = 'Propiedades YouTube' ;
FCKLang['DlgYouTubeCode'] = '"Por favor, inserte la URL de sus videos de YouTube."' ;
FCKLang['DlgYouTubeSecurity'] = 'URL no v&amp;alida.' ;
FCKLang['DlgYouTubeURL'] = 'URL' ;
FCKLang['DlgYouTubeWidth'] = 'Ancho' ;
FCKLang['DlgYouTubeHeight'] = 'Alto' ;
FCKLang['DlgYouTubeQuality'] = 'Calidad' ;
FCKLang['DlgYouTubeLow'] = 'Baja' ;
FCKLang['DlgYouTubeHigh'] = 'Alta (Si est&aacute; disponible)' ;
FCKLang['DlgYouTubeURLTip'] = 'Ayuda:' ;
FCKLang['DlgYouTubeURLTipContent1'] = 'Vaya a %s. Navegue por este sitio para encontrar su video.' ;
FCKLang['DlgYouTubeURLTipContent2'] = 'Copie la direcci&oacute;n URL del video que aparece en su navegador y p&eacute;guela aqu&iacute;.' ;
FCKLang['DlgYouTubeURLTipContent3'] = 'La URL copiada deber&iacute;a tener un aspecto semejante a %s.' ;

2118
main/inc/lib/main_api.lib.php
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save